Rebuild qos-script at core38 update.

[people/pmueller/ipfire-2.x.git] / config / rootfiles / core / 38 / update.sh

diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh
index 095d7ba2aa80fad63c8706ba08907d0ddd913768..d15b829d16900bdad9bf6f81f54bb8ddf24226b9 100644 (file)
--- a/config/rootfiles/core/38/update.sh
+++ b/config/rootfiles/core/38/update.sh
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 #
-KVER="2.6.32.11"
+KVER="2.6.32.12"
 ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
 MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
@@ -46,9 +46,8 @@ echo update archive. This may take a while ...
 echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
 echo boot >> /opt/pakfire/tmp/ROOTFILES
 echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES
-#
-# Todo: add openswan libs for backup ...
-#
+echo usr/lib/ipsec >> /opt/pakfire/tmp/ROOTFILES
+echo usr/libexec/ipsec >> /opt/pakfire/tmp/ROOTFILES
 tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
     -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1
 echo
@@ -61,9 +60,12 @@ rm -rf /boot/ipfirerd-*
 rm -rf /boot/vmlinuz-*
 # Don't remove old xen modules. Kernel may stored outside.
 rm -rf /lib/modules/*-ipfire
+
 #
-# Todo: remove openswan libs ...
+# remove openswan libs ...
 #
+rm -rf /usr/lib/ipsec
+rm -rf /usr/libexec/ipsec
 
 #
 # Stop Sevices
@@ -157,8 +159,20 @@ POSTCLEAN=`du -sh /var/log/rrd/collectd`
 #
 echo Cleaned up collectd directory from $PRECLEAN to $POSTCLEAN size.
 #
+# USB Modeswitch conf now called setup, rename ...
 #
-# Todo: rebuild qosscript if enabled...
+if [ -e /etc/usb_modeswitch.conf ]; then
+mv -f /etc/usb_modeswitch.conf /etc/usb_modeswitch.setup
+fi
+#
+# rebuild qosscript if enabled...
+if [ -e /var/ipfire/qos/enable ]; then
+       /usr/local/bin/qosctrl stop
+fi
+/usr/local/bin/qosctrl generate
+if [ -e /var/ipfire/qos/enable ]; then
+       /usr/local/bin/qosctrl start
+fi
 #
 #
 # Todo convert ipsec.conf from open to strongswan...
@@ -167,7 +181,6 @@ echo Cleaned up collectd directory from $PRECLEAN to $POSTCLEAN size.
 # Start Sevices
 #
 /etc/init.d/squid start
-/etc/init.d/collectd start
 #
 # This core-update need a reboot
 /usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg"