X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Frootfiles%2Fcore%2F38%2Fupdate.sh;h=244b188bd9a3aaee9145ccbb10a09095fb317f10;hp=769ba1500fba296aab08ef9903d68f836428014f;hb=48cad624e6b98867559ca7b35e88d76cb419c383;hpb=4ad5ead0d9ddfa27c44b500787e9cff2efd645f1

diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh
index 769ba1500f..244b188bd9 100644
--- 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,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,20 +68,21 @@ 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/squid stop
+rm -rf /usr/lib/ipsec
+rm -rf /usr/libexec/ipsec
 
 #
 # Backup grub.conf
 #
 cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
 #
+# Stop sysklogd
+/etc/init.d/sysklogd stop
+#
 # Unpack the updated files
 #
 echo
@@ -83,6 +91,10 @@ echo Unpack the updated files ...
 tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
 	--no-overwrite-dir
 #
+# Start Sevices
+/etc/init.d/sysklogd start
+/etc/init.d/squid start
+#
 # Modify grub.conf
 #
 echo
@@ -132,20 +144,81 @@ grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
 #
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 #
-# Todo: rebuild qosscript if enabled...
+# Cleanup Collectd statistics...
 #
+PRECLEAN=`du -sh /var/log/rrd/collectd`
 #
-# Todo convert ipsec.conf from open to strongswan...
+rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_count*
+rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_pagefaults*
+rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_stacksize*
+rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_state*
+rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_vm*
 #
+rm -rf /var/log/rrd*/collectd/localhost/interface/if_errors*
+rm -rf /var/log/rrd*/collectd/localhost/interface/if_packets*
 #
-# Start Sevices
+rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_merged*
+rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_ops*
+rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_time*
 #
-/etc/init.d/squid start
+rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-INPUT/*-DROP_Wirelessinput*
+rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-FORWARD/*-DROP_Wirelessforward*
+rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-OUTGOINGFW
+POSTCLEAN=`du -sh /var/log/rrd/collectd`
 #
-# Delete old lm-sensor modullist...
+echo Cleaned up collectd directory from $PRECLEAN to $POSTCLEAN size.
+#
+# Start collectd
+/etc/init.d/collectd start
+#
+# Delete old lm-sensor modullist to force search at next boot
 #
 rm -rf /etc/sysconfig/lm_sensors
 #
+# USB Modeswitch conf now called setup, rename ...
+#
+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
+	/usr/local/bin/qosctrl generate
+	/usr/local/bin/qosctrl start
+fi
+#
+#
+# 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 "lefthostaccess=" | \
+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\n\tlefthostaccess=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
+#
+# Add cryptodev to /etc/sysconfig/modules
+mv /etc/sysconfig/modules /etc/sysconfig/modules.org
+cat /etc/sysconfig/modules.org | \
+grep -v "cryptodev" | \
+grep -v "# End /etc/sysconfig/modules" > /etc/sysconfig/modules
+echo "" >> /etc/sysconfig/modules
+echo "### cryptodev" >> /etc/sysconfig/modules
+echo "#" >> /etc/sysconfig/modules
+echo "cryptodev" >> /etc/sysconfig/modules
+echo "" >> /etc/sysconfig/modules
+echo "# End /etc/sysconfig/modules" >> /etc/sysconfig/modules
+chmod 644 /etc/sysconfig/modules
+#
 # 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"
 /usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Check it before reboot !!!"