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

[bootcd.git] / initscripts / pl_netinit

diff --git a/initscripts/pl_netinit b/initscripts/pl_netinit
index 5e288c2..9e895c7 100755 (executable)
--- a/initscripts/pl_netinit
+++ b/initscripts/pl_netinit
@@ -1,6 +1,8 @@
 #!/bin/sh
 #-*-shell-script-*-
 
+set -x
+
 # the name of the floppy based network configuration
 # files (checked first). the name planet.cnf is kept
 # for backward compatibility with old nodes, and only
@@ -283,20 +285,43 @@ 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
+    if /sbin/ifconfig $ETH_DEVICE >& /dev/null; then
+       echo Device $ETH_DEVICE found - proceeding - timeout=$TIMEOUT
+       break
+    fi
+    echo $(date "+%H:%M:%S") " pl_netinit: waiting for device $ETH_DEVICE, ${TIMEOUT}s remaining "
+    TIMEOUT=$(($TIMEOUT-1))
+    [ $TIMEOUT -le 0 ] && net_init_failed
+    sleep 1
+done
+
 
 # actually check to make sure ifconfig <device> succeeds
-/sbin/ifconfig $ETH_DEVICE up 2>&1 > /dev/null
-if [[ $? -ne 0 ]]; then
+
+/sbin/ifconfig $ETH_DEVICE up 2>&1 > /dev/null || {
     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: network adapter. please send the following lines"
     echo $(date "+%H:%M:%S") " pl_netinit: to your PlanetLab support for further assistance"
-    echo
+    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
+}
 
 echo $(date "+%H:%M:%S") " pl_netinit: attempting to start networking"
 /sbin/service network start