From 761ef000c37a5751a78491bcdc3a2ce71b6546bf Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 25 Sep 2008 00:30:31 +0200
Subject: [PATCH] Add dialer to updater Reinstall grub after kernel update
 again dialer changes for pin handling

---
 config/rootfiles/updater/filelists/files |  1 +
 config/rootfiles/updater/update.sh       | 10 ++++++++++
 src/ppp/dialer                           |  9 +++++----
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/config/rootfiles/updater/filelists/files b/config/rootfiles/updater/filelists/files
index 43a11d5f6..def3d9117 100644
--- a/config/rootfiles/updater/filelists/files
+++ b/config/rootfiles/updater/filelists/files
@@ -3,6 +3,7 @@ etc/init.d/mISDN
 etc/modprobe.d/blacklist
 usr/bin/bc
 usr/bin/dc
+etc/ppp/dialer
 etc/rc.d/init.d/checkfstab
 etc/rc.d/rcsysinit.d/S19checkfstab
 etc/rc.d/init.d/dhcp
diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 6a584649b..2f6945664 100755
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -54,6 +54,8 @@ echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES
 echo var/log/rrd >> /opt/pakfire/tmp/ROOTFILES
 echo var/updatexlerator >> /opt/pakfire/tmp/ROOTFILES
 echo lib/iptables >> /opt/pakfire/tmp/ROOTFILES
+echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
+echo boot >> /opt/pakfire/tmp/ROOTFILES
 #
 tar cjvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
    -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1 
@@ -64,6 +66,10 @@ echo Update IPfire to $NEWVERSION ...
 #
 rm -rf /etc/rc.d/rc3.d/S20collectd
 #
+# Delete squid symlink
+#
+rm -rf /etc/rc.d/rc3.d/S99squid
+#
 # Delete old iptables libs...
 #
 rm -rf /lib/iptables
@@ -126,6 +132,10 @@ fi
 mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
 #mkinitcpio -k $KVER-ipfire-smp -g /boot/ipfirerd-$KVER-smp.img
 #
+# ReInstall grub
+#
+grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
+#
 # Change version of Pakfire.conf
 #
 sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf
diff --git a/src/ppp/dialer b/src/ppp/dialer
index d1dba0ac1..208e3b967 100644
--- a/src/ppp/dialer
+++ b/src/ppp/dialer
@@ -19,9 +19,9 @@ my %modemsettings;
 &General::readhash("${General::swroot}/modem/settings", \%modemsettings);
 
 if ($modemsettings{'INIT'} eq '') {
-	$modemsettings{'INIT'} = 'AT'; }
+	$modemsettings{'INIT'} = '+++ATZ'; }
 if ($modemsettings{'HANGUP'} eq '') {
-	$modemsettings{'HANGUP'} = 'AT'; }
+	$modemsettings{'HANGUP'} = 'ATH'; }
 if ($modemsettings{'SPEAKER_ON'} eq '') {
 	$modemsettings{'SPEAKER_ON'} = 'AT'; }
 if ($modemsettings{'SPEAKER_OFF'} eq '') {
@@ -82,8 +82,9 @@ my $com = "/usr/sbin/chat -v -r /var/log/connect.log			\
 	ABORT			'\\nRINGING\\r\\n\\r\\nRINGING\\r'	\
 	ABORT			'\\nNO CARRIER\\r'			\
 	''			'$modemsettings{'INIT'}'		\
-	OK			'$add_at1'				\
-	''			'$modemsettings{'HANGUP'}'		\
+	''			'$add_at1'				\
+	''			'$modemsettings{'INIT'}'		\
+	OK			'$modemsettings{'HANGUP'}'		\
 	OK			'$speaker'				\
 	OK			'$add_at2'				\
 	''			'$add_at3'				\
-- 
2.39.2