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=6702f42bd59ec85b2de90f4e130fd1d48df0cd21;hp=769ba1500fba296aab08ef9903d68f836428014f;hb=58fcc270a78944d1c2d856f01a971640004e03d5;hpb=635ba6a5b26678328d500c6dc7ebdbcaeaa71b27

diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh
index 769ba1500f..6702f42bd5 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
@@ -68,6 +68,7 @@ rm -rf /lib/modules/*-ipfire
 #
 # Stop Sevices
 #
+/etc/init.d/collectd stop
 /etc/init.d/squid stop
 
 #
@@ -132,6 +133,35 @@ grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
 #
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 #
+# Delete old lm-sensor modullist...
+#
+rm -rf /etc/sysconfig/lm_sensors
+#
+# Cleanup Collectd statistics...
+#
+PRECLEAN=`du -sh /var/log/rrd/collectd`
+#
+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*
+#
+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*
+POSTCLEAN=`du -sh /var/log/rrd/collectd`
+#
+echo Cleaned up collectd directory from $PRECLEAN to $POSTCLEAN size.
+#
+# USB Modeswitch conf now called setup, rename ...
+#
+mv -f /etc/usb_modeswitch.conf /etc/usb_modeswitch.setup
+#
+#
 # Todo: rebuild qosscript if enabled...
 #
 #
@@ -142,10 +172,6 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 #
 /etc/init.d/squid start
 #
-# Delete old lm-sensor modullist...
-#
-rm -rf /etc/sysconfig/lm_sensors
-#
 # 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 !!!"