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

diff --git a/initscripts/pl_netinit b/initscripts/pl_netinit
index 6fac990..071873c 100755
--- 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
@@ -59,6 +61,17 @@ DEFAULT_NET_CONF=0
 function net_init_failed() {
     echo
     echo $(date "+%H:%M:%S") " pl_netinit: network initialization failed,"
+    echo
+    echo For forensics
+    echo
+    echo ========== lspci beg
+    /sbin/lspci -n | /bin/grep "Class 0200"    
+    echo ========== lspci end
+    echo
+    echo ========== ifconfig beg
+    /sbin/ifconfig
+    echo ========== ifconfig end
+    echo 
     echo $(date "+%H:%M:%S") " pl_netinit: shutting down machine in two hours"
     /bin/sleep 2h
     /sbin/shutdown -h now
@@ -284,41 +297,37 @@ if [[ -z "$ETH_DEVICE" ]]; then
 fi
 
 # within a systemd-driven startup, we often see this stage
-# triggered before the network is actually up
+# triggered before the network interface is actually exposed
+# by udev/kernel
 # 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
+ALLOW=5
+COUNTER=0
 while true; do
-    /sbin/ifconfig $ETH_DEVICE >& /dev/null && continue
-    TIMEOUT=$(($TIMEOUT-1))
-    [ $TIMEOUT -le 0 ] && net_init_failed
+    if /sbin/ifconfig $ETH_DEVICE >& /dev/null; then
+	echo "pl_netinit: device present $ETH_DEVICE, proceeding (${COUNTER}s/${ALLOW}s)"
+	break
+    fi
+    echo $(date "+%H:%M:%S") " pl_netinit: waiting for device $ETH_DEVICE,${COUNTER}s/${ALLOW}s"
+    COUNTER=$(($COUNTER+1))
+    [ $COUNTER -ge $ALLOW ] && 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
+/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 ========== lspci beg
-    /sbin/lspci -n | /bin/grep "Class 0200"    
-    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