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
#
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
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
&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 '') {
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' \