X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config%2Frootfiles%2Fcore%2F51%2Fupdate.sh;h=58a47da0d3e33b4b49ff5d72a70c3d106f844429;hb=refs%2Fheads%2Fcore51;hp=78e6a53e0c70e31d218fb779c4fe281c39775bb2;hpb=6c8dc2fde71ecaf61ab27b279ef31c7dd11c8c02;p=ipfire-2.x.git

diff --git a/config/rootfiles/core/51/update.sh b/config/rootfiles/core/51/update.sh
index 78e6a53e0c..58a47da0d3 100644
--- a/config/rootfiles/core/51/update.sh
+++ b/config/rootfiles/core/51/update.sh
@@ -44,12 +44,11 @@ fi
 
 
 #
-# check if we the backup file already exist
-if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then
-    echo Moving backup to backup-old ...
-    mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
-       /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2
-fi
+# erase old backups to prefent disk-full on small installations
+rm -f /var/ipfire/backup/core-upgrade_*.tar.bz2
+
+#
+# backup
 echo First we made a backup of all files that was inside of the
 echo update archive. This may take a while ...
 # Add some files that are not in the package to backup
@@ -68,7 +67,7 @@ rm -rf /boot/System.map-*
 rm -rf /boot/config-*
 rm -rf /boot/ipfirerd-*
 rm -rf /boot/vmlinuz-*
-rm -rf /lib/modules/*-ipfire
+rm -rf /lib/modules/*
 #
 # Backup grub.conf
 #
@@ -80,7 +79,7 @@ cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
 /etc/init.d/snort stop
 /etc/init.d/squid stop
 /etc/init.d/ipsec stop
-
+/etc/init.d/dhcp stop
 #
 # Unpack the updated files
 #
@@ -97,12 +96,14 @@ rm -f /etc/modprobe.d/ralink_wireless
 #
 # Start services
 #
+/etc/init.d/dhcp start
 /etc/init.d/squid start
 /etc/init.d/snort start
 if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
 	/etc/init.d/ipsec start
 fi
 
+
 #
 # Modify grub.conf
 #
@@ -142,15 +143,29 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 #
 rm -rf /etc/sysconfig/lm_sensors
 
+# Ensure that all data was written...
+sync
+sync
+sync
+
 # Reboot message to console
 /usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Upgrade finished. If you use a customized grub.cfg"
 /usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Check it before reboot !!!"
 /usr/bin/logger -p syslog.emerg -t core-upgrade-51 " *** Please reboot... *** "
 
+# This update need a reboot.
+touch /var/run/need_reboot
 
 #
 #Finish
 /etc/init.d/fireinfo start
 sendprofile
+
+# Ensure that all data was written...
+sync
+sync
+sync
+
+#
 #Don't report the exitcode last command
 exit 0