Stop ipsec 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 e4843b8058a9f2feed257de25efa8d2ed71d943b..17f657e62a0aa686f6faa1a860577572f85bec52 100644 (file)
--- a/config/rootfiles/core/38/update.sh
+++ b/config/rootfiles/core/38/update.sh
@@ -46,11 +46,18 @@ 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
+
+#
+# Stop Sevices
+#
+/etc/init.d/collectd stop
+/etc/init.d/squid stop
+/etc/init.d/ipsec stop
+
 echo
 echo Update Kernel to $KVER ...
 # Remove old kernel, configs, initrd, modules ...
@@ -61,15 +68,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 ...
-#
 
 #
-# Stop Sevices
+# remove openswan libs ...
 #
-/etc/init.d/collectd stop
-/etc/init.d/squid stop
+rm -rf /usr/lib/ipsec
+rm -rf /usr/libexec/ipsec
 
 #
 # Backup grub.conf
@@ -157,11 +161,37 @@ 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...
+# convert ipsec.conf from openswan to strongswan...
+mv /var/ipfire/vpn/ipsec.conf /var/ipfire/vpn/ipsec.conf.org
+cat /var/ipfire/vpn/ipsec.conf.org | \
+grep -v "disablearrivalcheck=" | \
+grep -v "klipsdebug=" | \
+grep -v "leftfirewall=" | \
+grep -v "charonstart=" | \
+grep -v "aggrmode=" > /var/ipfire/vpn/ipsec.conf
+sed -i "s|ipsec[0-9]=||g" /var/ipfire/vpn/ipsec.conf
+sed -i "s|nat_t ||g" /var/ipfire/vpn/ipsec.conf
+sed -i "s|klips ||g" /var/ipfire/vpn/ipsec.conf
+sed -i "s|^conn [A-Za-z].*$|&\n\tleftfirewall=yes|g" /var/ipfire/vpn/ipsec.conf
+sed -i "s|^config setup$|&\n\tcharonstart=no|g" /var/ipfire/vpn/ipsec.conf
+chown nobody:nobody /var/ipfire/vpn/ipsec.conf
+chmod 644 /var/ipfire/vpn/ipsec.conf
 #
 #
 # Start Sevices