X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=initscripts%2Fpl_netinit;h=6fac9901265ac01158e59c9bde55c1ac0eda3dd9;hb=d49dc966d8bff5ca455091649d3e711cd1539036;hp=a53e3cd3c4c6e1dbeeaaa2fbbc3a61d625d89dcd;hpb=44168eb5e74cff6bdc3580f233858e4b25f0b49a;p=bootcd.git

diff --git a/initscripts/pl_netinit b/initscripts/pl_netinit
index a53e3cd..6fac990 100755
--- a/initscripts/pl_netinit
+++ b/initscripts/pl_netinit
@@ -1,4 +1,5 @@
 #!/bin/sh
+#-*-shell-script-*-
 
 # the name of the floppy based network configuration
 # files (checked first). the name planet.cnf is kept
@@ -55,8 +56,7 @@ IFCONFIG_OUTPUT=/tmp/ifconfig
 DEFAULT_NET_CONF=0
 
 
-net_init_failed()
-{
+function net_init_failed() {
     echo
     echo $(date "+%H:%M:%S") " pl_netinit: network initialization failed,"
     echo $(date "+%H:%M:%S") " pl_netinit: shutting down machine in two hours"
@@ -66,8 +66,7 @@ net_init_failed()
 }
 
 # Function for checking the IP address to see if its sensible.
-check_ip()
-{
+function check_ip() {
     case "$*" in
         "" | *[!0-9.]* | *[!0-9]) return 1 ;;
     esac
@@ -82,8 +81,7 @@ check_ip()
 # return 1 if found and parsed. if this is the case, DEFAULT_NET_CONF will 
 # be set to 1. For any found configuration file, $USED_NET_CONF will
 # contain the validated contents
-find_node_config()
-{
+function find_node_config() {
     /bin/rm -f $TMP_OLD_FLOPPY_CONF_FILE 2>&1 > /dev/null
 
     echo $(date "+%H:%M:%S") " pl_netinit: looking for node configuration file on floppy"
@@ -128,13 +126,13 @@ find_node_config()
     # devices
     shopt -s nullglob
 
-    for device in /sys/block/[hs]d*; do
-	removable=`cat $device/removable`
+    for device in /sys/block/[hsv]d*; do
+	removable=$(cat $device/removable)
 	if [[ $removable -ne 1 ]]; then
 	    continue
 	fi
 
-	partitions=$(/bin/awk "\$4 ~ /`basename $device`[0-9]*/ { print \$4 }" /proc/partitions)
+	partitions=$(/bin/awk "\$4 ~ /$(basename $device)[0-9]*/ { print \$4 }" /proc/partitions)
 	for partition in $partitions ; do
 	    check_dev=/dev/$partition
 
@@ -256,7 +254,7 @@ if [[ -n "$NET_DEVICE" ]]; then
 
     pushd /sys/class/net
     for device in *; do
-	dev_address=`cat $device/address | tr A-Z a-z`
+	dev_address=$(cat $device/address | tr A-Z a-z)
 	if [ "$device" == "$NET_DEVICE" -o "$dev_address" == "$NET_DEVICE" ]; then
 	    ETH_DEVICE=$device
 	    echo $(date "+%H:%M:%S") " pl_netinit: found device $ETH_DEVICE with mac address $dev_address"
@@ -285,18 +283,39 @@ if [[ -z "$ETH_DEVICE" ]]; then
     net_init_failed
 fi
 
+# within a systemd-driven startup, we often see this stage
+# triggered before the network is actually up
+# although of course we have network-online.target
+# as a requirement; go figure what systemd actually does..
+
+# in any case, let us try to work around that by allowing some delay
+# here
+
+TIMEOUT=30
+while true; do
+    /sbin/ifconfig $ETH_DEVICE >& /dev/null && continue
+    TIMEOUT=$(($TIMEOUT-1))
+    [ $TIMEOUT -le 0 ] && net_init_failed
+    sleep 1
+    echo $(date "+%H:%M:%S") " pl_netinit: waiting for device $ETH_DEVICE, ${TIMEOUT}s remaining "
+done
+
 
 # actually check to make sure ifconfig <device> succeeds
+
 /sbin/ifconfig $ETH_DEVICE up 2>&1 > /dev/null
+
 if [[ $? -ne 0 ]]; then
     echo $(date "+%H:%M:%S") " pl_netinit: device $ETH_DEVICE does not exist, most likely"
-    echo $(date "+%H:%M:%S") " pl_netinit: this cd does not have hardware support for your"
+    echo $(date "+%H:%M:%S") " pl_netinit: this CD does not have hardware support for your"
     echo $(date "+%H:%M:%S") " pl_netinit: network adapter. please send the following lines"
-    echo $(date "+%H:%M:%S") " pl_netinit: to PlanetLab Support: support@planet-lab.org"
-    echo $(date "+%H:%M:%S") " pl_netinit: for further assistance"
-    echo
+    echo $(date "+%H:%M:%S") " pl_netinit: to your PlanetLab support for further assistance"
+    echo ========== lspci beg
     /sbin/lspci -n | /bin/grep "Class 0200"    
-    echo
+    echo ========== lspci end
+    echo ========== ifconfig beg
+    /sbin/ifconfig
+    echo ========== ifconfig beg
 
     net_init_failed
 fi
@@ -308,4 +327,3 @@ echo $(date "+%H:%M:%S") " pl_netinit: attempting to start networking"
 /sbin/ifconfig $ETH_DEVICE > $IFCONFIG_OUTPUT
 
 echo $(date "+%H:%M:%S") " pl_netinit: network online"
-