Marked as 2.3 Final / core 22

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

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 6ed28e0cd064f643618bdd9a47620ea266704819..e6b26d3224956226af20c7d6cbf28aa194f4f14e 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
@@ -38,10 +38,10 @@ echo Update IPFire $OLDVERSION to $NEWVERSION
 echo
 #
 # check if we the backup file already exist
-if [ -e /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 ]; then
+if [ -e /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.gz ]; then
     echo Moving backup to backup-old ...
-    mv -f /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
-       /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION-old.tar.bz2
+    mv -f /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.gz \
+       /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION-old.tar.gz
 fi
 echo First we made a backup of all files that was inside of the
 echo update archive. This may take a while ...
@@ -52,6 +52,7 @@ echo var/spool/cron/root.orig >> /opt/pakfire/tmp/ROOTFILES
 echo etc/udev/rules.d/30-persistent-network.rules >> /opt/pakfire/tmp/ROOTFILES
 echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES
 echo var/log/rrd >> /opt/pakfire/tmp/ROOTFILES
+echo var/log/vnstat >> /opt/pakfire/tmp/ROOTFILES
 echo var/updatexlerator >> /opt/pakfire/tmp/ROOTFILES
 echo lib/iptables >> /opt/pakfire/tmp/ROOTFILES
 echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
@@ -62,11 +63,17 @@ echo srv/web/ipfire/cgi-bin/traffics.cgi >> /opt/pakfire/tmp/ROOTFILES
 echo srv/web/ipfire/cgi-bin/graphs.cgi >> /opt/pakfire/tmp/ROOTFILES
 echo srv/web/ipfire/cgi-bin/qosgraph.cgi >> /opt/pakfire/tmp/ROOTFILES
 #
-tar cjvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
+tar czvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.gz \
    -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1 
 echo
 echo Update IPfire to $NEWVERSION ...
 #
+# On some systems the folder for addon backups is missing
+#
+if [ ! -e /var/ipfire/backup/addons/backup ]; then
+    mkdir -p /var/ipfire/backup/addons/backup
+fi
+#
 # Delete old collectd symlink
 #
 rm -rf /etc/rc.d/rc3.d/S20collectd
@@ -105,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
 #
@@ -144,7 +153,6 @@ fi
 fi
 mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
 #mkinitcpio -k $KVER-ipfire-smp -g /boot/ipfirerd-$KVER-smp.img
-mkinitcpio -k 2.6.25.17-ipfire -g /boot/ipfirerd-2.6.25.17.img
 #
 # ReInstall grub
 #
@@ -153,10 +161,10 @@ grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
 # Update fstab
 #
 grep -v "tmpfs" /etc/fstab > /tmp/fstab.tmp
-echo shm       /dev/shm        tmpfs   defaults,size=25%       0       0 >> /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=32M       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
@@ -171,9 +179,11 @@ echo \\n running on \\s \\r \\m >> /etc/issue
 #
 # Update crontab
 #
-grep -v "ipacsum" /var/spool/cron/root.orig > /tmp/root.orig.tmp
+grep -v "ipacsum" /var/spool/cron/root.orig | grep -v "hddshutdown" > /tmp/root.orig.tmp
 echo "# Backup collectd files" >> /tmp/root.orig.tmp
-echo "01 * * * *       /etc/init.d/collectd backup >/dev/null" >> /tmp/root.orig.tmp
+echo "* 05 * * *       /etc/init.d/tmpfs backup >/dev/null" >> /tmp/root.orig.tmp
+echo "# hddshutdown" >> /tmp/root.orig.tmp
+echo "*/30 * * * *     /usr/local/bin/hddshutdown >/dev/null" >> /tmp/root.orig.tmp
 mv /tmp/root.orig.tmp /var/spool/cron/root.orig
 chmod 600 /var/spool/cron/root.orig
 chown root:cron /var/spool/cron/root.orig
@@ -183,6 +193,19 @@ chown root:cron /var/spool/cron/root.orig
 sed -i 's|"net", SYSFS{address}|"net", SYSFS{type}=="1", SYSFS{address}|g' \
           /etc/udev/rules.d/30-persistent-network.rules
 #
+# 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"
@@ -211,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-22 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
 #
 chmod +x /tmp/remove_obsolete_paks
 /tmp/remove_obsolete_paks &