random: update initskript for machines with low entropy

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

diff --git a/config/rootfiles/core/122/update.sh b/config/rootfiles/core/122/update.sh
index 6105bf280b057cd0ca2de9ee7fe6422886acfdfd..bb38696c40069ed3410f6555d6577f1bedca6a68 100644 (file)
--- a/config/rootfiles/core/122/update.sh
+++ b/config/rootfiles/core/122/update.sh
@@ -29,6 +29,8 @@ core=122
 exit_with_error() {
        # Set last succesfull installed core.
        echo $(($core-1)) > /opt/pakfire/db/core/mine
+       # don't start pakfire again at error
+       killall -KILL pak_update
        /usr/bin/logger -p syslog.emerg -t ipfire \
                "core-update-${core}: $1"
        exit $2
@@ -59,7 +61,7 @@ esac
 # Check diskspace on root
 ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
 
-if [ $ROOTSPACE -lt 100000 ]; then
+if [ $ROOTSPACE -lt 80000 ]; then
        exit_with_error "ERROR cannot update because not enough free space on root." 2
        exit 2
 fi
@@ -75,6 +77,7 @@ rm -rf /boot/zImage-ipfire-*
 rm -rf /boot/uInit-ipfire-*
 rm -rf /boot/dtb-*-ipfire-*
 rm -rf /lib/modules
+rm -f  /etc/sysconfig/lm_sensors
 
 # Stop services
 
@@ -114,6 +117,8 @@ if [ -e /boot/pakfire-kernel-update ]; then
        /boot/pakfire-kernel-update ${KVER}
 fi
 
+mv /etc/rc.d/rc3.d/S??random /etc/rc.d/rc3.d/S00random
+
 case "$(uname -m)" in
        i?86)
                # Force (re)install pae kernel if pae is supported
@@ -121,7 +126,7 @@ case "$(uname -m)" in
                if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
                        ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
                        BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
-                       if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then
+                       if [ $BOOTSPACE -lt 22000 -o $ROOTSPACE -lt 120000 ]; then
                                /usr/bin/logger -p syslog.emerg -t ipfire \
                                "core-update-${core}: WARNING not enough space for pae kernel."
                        else
@@ -140,16 +145,16 @@ esac
 /etc/init.d/fireinfo start
 sendprofile
 
-# Update grub config to display new core version
+# Install new grub and update config
 if [ -e /boot/grub/grub.cfg ]; then
-       grub-mkconfig -o /boot/grub/grub.cfg
+       /usr/local/bin/update-bootloader
 fi
 
 sync
 
 # Reload microcode
 modprobe microcode
-if [ -w "/sys/devices/system/cpu/microcode/reload" ];
+if [ -w "/sys/devices/system/cpu/microcode/reload" ]; then
        echo 1 > /sys/devices/system/cpu/microcode/reload
 fi