X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=initscripts%2Fpl_sysinit;h=d27f910b0e9efea8750aa2efdcc155afe8b64314;hb=9e29a8c5c82979bc51ad1ffa4cef9d7c41c21e16;hp=dd2f893f9bf1d06572de42318ac911534be612d3;hpb=c2127494a9b277ddb164ff04a79c1724a3e3ae2e;p=bootcd.git diff --git a/initscripts/pl_sysinit b/initscripts/pl_sysinit index dd2f893..d27f910 100755 --- a/initscripts/pl_sysinit +++ b/initscripts/pl_sysinit @@ -6,7 +6,7 @@ exec 2>&1 exec > /dev/console ### -. /etc/init.d/pl_functions +source /etc/init.d/pl_functions verbose-message "PlanetLab BootCD - distro @PLDISTRO@ based on @FCDISTRO@" @@ -60,7 +60,7 @@ function check-block-devices() { start_device=${device:0:2} if [ "$start_device" == "ra" ] || [ "$start_device" == "md" ] || - [ "$start_device" == "lo" ] || [ "$start_device" == "fd" ]; then + [ "$start_device" == "lo" ] || [ "$start_device" == "fd" ]; then continue fi @@ -86,7 +86,7 @@ function check-block-devices() { fi done fi - + verbose-message "pl_sysinit: checking $device for /usr contents" /bin/mount -o ro -t iso9660 /dev/$device /usr 2>&1 > /dev/null if [ $? -eq 0 ]; then @@ -126,7 +126,7 @@ if [ $mounted -eq 0 ]; then 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 +# source. Since fedora decided not to include it in the rpm, it is # being copied here function create-device-mapper-node() { @@ -137,7 +137,7 @@ function create-device-mapper-node() { MAJOR=$(sed -n 's/^ *\([0-9]\+\) \+misc$/\1/p' /proc/devices) MINOR=$(sed -n "s/^ *\([0-9]\+\) \+$DM_NAME\$/\1/p" /proc/misc) - + if [ -n "$MAJOR" ] && [ -n "$MINOR" ]; then /bin/mkdir -p --mode=755 $DIR /bin/rm -f $CONTROL @@ -151,19 +151,19 @@ verbose-message "pl_sysinit: creating device mapper control node" create-device-mapper-node verbose-message "pl_sysinit: configuring kernel parameters" -verbose-run /sbin/sysctl -e -p /etc/sysctl.conf +verbose-run /sbin/sysctl -e -p /etc/sysctl.conf # startup rsyslog if available (we're *NOT* running the standard rc) syslog=/etc/rc.d/init.d/rsyslog if [ -x $syslog ]; then verbose-message "pl_sysinit: starting rsyslog" - verbose-run $syslog start + verbose-run $syslog start else verbose-message "pl_sysinit: WARNING cannot start rsyslog" fi verbose-message "pl_sysinit: bringing network online" -verbose-run /etc/init.d/pl_netinit +verbose-run /etc/init.d/pl_netinit function sync-clock() { /usr/sbin/ntpdate -b -t 10 -u pool.ntp.org