Add dialer to updater

Reinstall grub after kernel update
again dialer changes for pin handling
This commit is contained in:
Arne Fitzenreiter
2008-09-25 00:30:31 +02:00
parent f0f2978fc5
commit 761ef000c3
3 changed files with 16 additions and 4 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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' \