Minior Kernel Update 2.6.25.19

[ipfire-2.x.git] / config / rootfiles / updater / update.sh

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index b16a0968d42ab8bf080327a02beca92415ec962b..0e4f7e4305b4c5018973b146c82f845226ef1bda 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -26,7 +26,7 @@
 #
 OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
 NEWVERSION="2.3"
-KVER="2.6.23.17"
+KVER="2.6.25.19"
 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
@@ -112,7 +112,9 @@ echo Stopping Squid ...
 #
 echo
 echo Unpack the updated files ...
-extract_files
+#
+tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
+       --no-overwrite-dir
 #
 # Starting Squid
 #
@@ -159,10 +161,10 @@ grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
 # Update fstab
 #
 grep -v "tmpfs" /etc/fstab > /tmp/fstab.tmp
-echo "none     /tmp            tmpfs   defaults,size=128M      0       0" >> /tmp/fstab.tmp
-echo "none     /var/log/rrd    tmpfs   defaults,size=64M       0       0" >> /tmp/fstab.tmp
-echo "none     /var/lock       tmpfs   defaults,size=16M       0       0" >> /tmp/fstab.tmp
-echo "none     /var/run        tmpfs   defaults,size=16M       0       0" >> /tmp/fstab.tmp
+echo "#none    /tmp            tmpfs   defaults        0       0" >> /tmp/fstab.tmp
+echo "none     /var/log/rrd    tmpfs   defaults,size=112M      0       0" >> /tmp/fstab.tmp
+echo "none     /var/lock       tmpfs   defaults,size=8M        0       0" >> /tmp/fstab.tmp
+echo "none     /var/run        tmpfs   defaults,size=8M        0       0" >> /tmp/fstab.tmp
 mv /tmp/fstab.tmp /etc/fstab
 #
 # Change version of Pakfire.conf
@@ -194,11 +196,16 @@ sed -i 's|"net", SYSFS{address}|"net", SYSFS{type}=="1", SYSFS{address}|g' \
 # Move vnstat database to /var/log/rrd
 #
 mkdir -p /var/log/rrd.bak/vnstat
+mkdir -p /var/log/rrd/vnstat
 if [ -e /var/log/vnstat ]; then
     cp -pR /var/log/vnstat /var/log/rrd.bak/vnstat
     mv /var/log/vnstat /var/log/rrd/vnstat
 fi
 #
+# Fix qos.sh 
+#
+sed -i 's|rmmod imq|#rmmod imq|g' /var/ipfire/qos/bin/qos.sh
+#
 # Core 17
 #
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
@@ -213,14 +220,6 @@ rm -rf /etc/sysconfig/lm_sensors
 #
 /etc/init.d/mISDN config
 #
-# Update permissions
-#
-chown -r nobody:nobody /var/ipfire/outgoing
-chown -r nobody:nobody /var/ipfire/proxy
-chown -r nobody:nobody /var/ipfire/qos
-chown -r nobody:nobody /var/ipfire/urlfilter
-chown -r nobody:nobody /var/ipfire/updatexlerator
-#
 # Remove obsolete packages, update the lists and do upgrade
 #
 echo '#!/bin/bash'                                        >  /tmp/remove_obsolete_paks 
@@ -235,7 +234,7 @@ echo '/opt/pakfire/pakfire update -y --force'             >> /tmp/remove_obsolet
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/remove_obsolete_paks
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/remove_obsolete_paks
 echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/remove_obsolete_paks
-echo 'logger -p syslog.emerg -t core-upgrade-18 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
+echo 'logger -p syslog.emerg -t core-upgrade-20 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
 #
 chmod +x /tmp/remove_obsolete_paks
 /tmp/remove_obsolete_paks &