Change collectd symlink to be started after network

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

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 3ea3835baa8451941c184f8fd735563782455f89..526e89d2579c7bc560bd3557d2cdbfe632467d9e 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -5,7 +5,7 @@
 #                                                                          #
 # IPFire is free software; you can redistribute it and/or modify           #
 # it under the terms of the GNU General Public License as published by     #
-# the Free Software Foundation; either version 2 of the License, or        #
+# the Free Software Foundation; either version 3 of the License, or        #
 # (at your option) any later version.                                      #
 #                                                                          #
 # IPFire is distributed in the hope that it will be useful,                #
@@ -21,41 +21,22 @@
 #                                                                          #
 ############################################################################
 #
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
 #
-OLDVERSION="2.1.1"
-NEWVERSION="2.2-test"
-CORE="14"
+OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
+NEWVERSION="2.3"
 KVER="2.6.20.21"
 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
 echo $MOUNT > /dev/null
 MOUNT=$_
-INSTALLEDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
-INSTALLEDCORE=`cat /opt/pakfire/db/core/mine`
 OLDKERNEL=`ls /boot/vmlinuz-*-ipfire | cut -d"-" -f2 | tail -n 1`
 #
-# check version
-#
-if [ ! "$INSTALLEDVERSION" == "$OLDVERSION" ]; then
-    echo Error! This update is only for IPFire $OLDVERSION Core $CORE
-    echo You have installed IPFire $INSTALLEDVERSION Core $INSTALLEDCORE
-    exit 1
-fi
-# check core
-if [ ! "$INSTALLEDCORE" == "$CORE" ]; then
-    echo Error! This update is only for IPFire $OLDVERSION Core $CORE
-    echo You have installed IPFire $INSTALLEDVERSION Core $INSTALLEDCORE
-    exit 2
-fi
-#
-#
 echo 
 echo Update IPFire $OLDVERSION to $NEWVERSION
 echo
-echo Press Enter to begin.
-read
-echo
 #
 # check if we the backup file already exist
 if [ -e /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 ]; then
@@ -65,11 +46,18 @@ if [ -e /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 ]; then
 fi
 echo First we made a backup of all files that was inside of the
 echo update archive. This may take a while ...
+# Add issue and packfire conf to backup
+echo etc/issue >> ROOTFILES
+echo opt/pakfire/etc/pakfire.conf >> ROOTFILES
 tar cjvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
    -T ROOTFILES --exclude='#*' -C / > /dev/null 2>&1 
 echo
 echo Update IPfire to $NEWVERSON ...
 #
+# Delete old collectd symlink
+#
+rm -rf /etc/rc.d/rc3.d/S20collectd
+#
 # Backup the old grub config
 #
 mv /boot/grub/grub.conf /boot/grub/grub-old.conf
@@ -78,7 +66,7 @@ mv /boot/grub/grub.conf /boot/grub/grub-old.conf
 #
 echo
 echo Unpack the updated files ...
-tar xjvf files.ipfire -C /
+extract_files
 # 
 # Modify grub.conf
 #
@@ -100,8 +88,9 @@ if [ "${ROOT:0:7}" == "/dev/sd" ]; then
     sed -i "s| ide | |g" /etc/mkinitcpio.conf
 else
 if [ "${ROOT:0:7}" == "/dev/hd" ]; then
-    # Remove pata hook if root is on hda 
+    # Remove pata & sata hook if root is on hda 
     sed -i "s| pata | |g" /etc/mkinitcpio.conf
+    sed -i "s| sata | |g" /etc/mkinitcpio.conf
 fi
 fi
 mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img