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 0e84fe3..389f8b6 100755 (executable)
--- a/initscripts/pl_sysinit
+++ b/initscripts/pl_sysinit
@@ -1,14 +1,32 @@
 #!/bin/sh
 
-echo $(date "+%H:%M:%S") " pl_sysinit: bringing system online"
+### xxx tmp debug
 
-echo $(date "+%H:%M:%S") " pl_sysinit: mounting file systems"
+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@"
+
+echo ""
+echo $(date "+%H:%M:%S") "pl_sysinit: bringing system online"
+
+echo ""
+echo $(date "+%H:%M:%S") "pl_sysinit: mounting file systems"
 /bin/mount -v -a
 
-echo $(date "+%H:%M:%S") " pl_sysinit: starting udevd"
+echo ""
+echo $(date "+%H:%M:%S") "pl_sysinit: starting udevd"
 [ -x /sbin/start_udev ] && /sbin/start_udev
 
-echo $(date "+%H:%M:%S") " pl_sysinit: invoking hardware initialization script"
+echo ""
+echo $(date "+%H:%M:%S") "pl_sysinit: invoking hardware initialization script"
 /etc/init.d/pl_hwinit
 
 check_initrd()
@@ -50,13 +68,13 @@ check_block_devices()
        if [ "$(cat /sys/block/$device/removable)" = "1" ] ; then
            partitions=$(/bin/awk "\$4 ~ /${device}[0-9]*/ { print \$4 }" /proc/partitions)
            for partition in $partitions ; do
-               echo $(date "+%H:%M:%S") " pl_sysinit: checking $partition for iso image"
+               echo $(date "+%H:%M:%S") "pl_sysinit: checking $partition for iso image"
                mkdir -p /tmp/$partition
                if /bin/mount -o ro -t msdos,ext2 /dev/$partition /tmp/$partition 2>&1 > /dev/null ; then
                # Look for the first ISO image
                    for iso in /tmp/$partition/*.iso ; do
                        if /sbin/losetup /dev/loop0 $iso ; then
-                           echo $(date "+%H:%M:%S") " pl_sysinit: using $(basename $iso) on $partition"
+                           echo $(date "+%H:%M:%S") "pl_sysinit: using $(basename $iso) on $partition"
                            device="loop0"
                            break
                        fi
@@ -68,7 +86,7 @@ check_block_devices()
            done
        fi
        
-       echo $(date "+%H:%M:%S") " pl_sysinit: checking $device for /usr contents"
+       echo $(date "+%H:%M:%S") "pl_sysinit: checking $device for /usr contents"
        /bin/mount -o ro -t iso9660 /dev/$device /usr 2>&1 > /dev/null
        if [ $? -eq 0 ]; then
        # it mounted, but we should probably make sure its our boot cd
@@ -81,7 +99,7 @@ check_block_devices()
            # eh, wrong cd, keep trying
                /bin/umount /usr 2>&1 /dev/null
            else
-               echo $(date "+%H:%M:%S") " pl_sysinit: found cd and mounted on /usr"
+               echo $(date "+%H:%M:%S") "pl_sysinit: found cd and mounted on /usr"
                _mounted=1
                break
            fi
@@ -90,7 +108,7 @@ check_block_devices()
     return $_mounted
 }
 
-echo $(date "+%H:%M:%S") " pl_sysinit: finding cd to mount on /usr"
+echo $(date "+%H:%M:%S") "pl_sysinit: finding cd to mount on /usr"
 mounted=0
 check_initrd
 if [ $? -eq 1 ]; then
@@ -102,7 +120,7 @@ else
 fi
 
 if [ $mounted -eq 0 ]; then
-    echo $(date "+%H:%M:%S") " pl_sysinit: unable to find boot cdrom, cannot continue."
+    echo $(date "+%H:%M:%S") "pl_sysinit: unable to find boot cdrom, cannot continue."
     # todo: maybe we can put a staticly linked sshd here
     /sbin/shutdown -h now
 fi
@@ -111,7 +129,7 @@ fi
 # parts of this were copied from devmap_mknod.sh from the device-mapper
 # source. Since fedora decided not to include it in the rpm, it is 
 # being copied here
-echo $(date "+%H:%M:%S") " pl_sysinit: creating device mapper control node"
+echo $(date "+%H:%M:%S") "pl_sysinit: creating device mapper control node"
 
 DM_DIR="mapper"
 DM_NAME="device-mapper"
@@ -126,14 +144,43 @@ if [ -n "$MAJOR" ] && [ -n "$MINOR" ]; then
     /bin/rm -f $CONTROL
     /bin/mknod --mode=600 $CONTROL c $MAJOR $MINOR
 else
-    echo $(date "+%H:%M:%S") " pl_sysinit: unable to create device mapper control node, continuing"
+    echo $(date "+%H:%M:%S") "pl_sysinit: unable to create device mapper control node, continuing"
 fi
 
-echo $(date "+%H:%M:%S") " pl_sysinit: configuring kernel parameters"
+echo ""
+echo $(date "+%H:%M:%S") "pl_sysinit: configuring kernel parameters"
 /sbin/sysctl -e -p /etc/sysctl.conf
 
-echo $(date "+%H:%M:%S") " pl_sysinit: bringing network online"
+# startup rsyslog if available (we're *NOT* running the standard rc)
+syslog=/etc/rc.d/init.d/rsyslog
+[ -x $syslog ] && $syslog start
+
+echo ""
+echo $(date "+%H:%M:%S") "pl_sysinit: bringing network online"
 /etc/init.d/pl_netinit
 
-echo $(date "+%H:%M:%S") " pl_sysinit: attempting to sync clock"
+# 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