fixed the logic for the timeout (break instead of continue..)

[bootcd.git] / initscripts / pl_sysinit

diff --git a/initscripts/pl_sysinit b/initscripts/pl_sysinit
index aa5bb52..389f8b6 100755 (executable)
--- a/initscripts/pl_sysinit
+++ b/initscripts/pl_sysinit
@@ -1,5 +1,16 @@
 #!/bin/sh
 
+### xxx tmp debug
+
+set -x
+echo pl_sysinit on console > /dev/console
+exec 2>&1
+exec > /dev/console
+echo pl_sysinit plain
+
+###
+. /etc/init.d/pl_functions
+
 echo ""
 echo "PlanetLab BootCD - distro @PLDISTRO@ based on @FCDISTRO@"
 
@@ -148,8 +159,28 @@ echo ""
 echo $(date "+%H:%M:%S") "pl_sysinit: bringing network online"
 /etc/init.d/pl_netinit
 
+# just in case, sometimes we're seeing weird stuff already at this point
+pl_network_sanity_checks
+
 echo ""
 echo $(date "+%H:%M:%S") "pl_sysinit: attempting to sync clock"
 /usr/sbin/ntpdate -b -t 10 -u pool.ntp.org
+
+# Handle /dev/rtc name change for newer kernels
+# otherwise hwclock fails
+baseMaj=`uname -r | cut -d "." -f1`
+baseMin=`uname -r | cut -d "." -f2`
+vers=`uname -r | cut -d "." -f3 | cut -d "-" -f1`
+if [ $baseMaj -eq 2 ];then
+    if [ $baseMin -eq 6 ]; then
+        if [ $vers -ge 32 ];then
+            if [ "$(readlink /dev/rtc)" != "/dev/rtc0" ]; then
+                rm -f /dev/rtc
+                ln -s /dev/rtc0 /dev/rtc
+            fi
+        fi
+    fi
+fi
+
 # save ntp clock to hardware
 /sbin/hwclock --systohc --utc