- move flash device delay from pl_netinit to pl_hwinit

[bootcd.git] / conf_files / pl_netinit

diff --git a/conf_files/pl_netinit b/conf_files/pl_netinit
index bfec8bf..a627bd2 100644 (file)
--- a/conf_files/pl_netinit
+++ b/conf_files/pl_netinit
@@ -54,12 +54,13 @@ IFCONFIG_OUTPUT=/tmp/ifconfig
 # (no other configuration file found)
 DEFAULT_NET_CONF=0
 
+
 net_init_failed()
 {
     echo
     echo "pl_netinit: network initialization failed,"
     echo "pl_netinit: shutting down machine in two hours"
-    /bin/sleep 7200
+    /bin/sleep 2h
     /sbin/shutdown -h now
     exit 1
 }
@@ -124,12 +125,6 @@ find_node_config()
 
     echo "pl_netinit: looking for node configuration file on flash based devices"
 
-    echo "pl_netinit: waiting for flash devices if any to come online"
-    # some usb flash based devices take a couple of seconds to initialize
-    # also, try to read the partition table off the device to make sure
-    # it shows up in /sys/block
-    /bin/sleep 10s
-
     # make the sd* expansion fail to an empty string if there are no sd
     # devices
     shopt -s nullglob
@@ -242,28 +237,21 @@ fi
 # either a mac address (in which case we will need to find the device), or
 # the device itself
 
-if [[ -n "$PRIMARY_MAC" ]]; then
+if [[ -n "$NET_DEVICE" ]]; then
     # the user specified a mac address we should use. find the network
     # device for it.
-    echo "pl_netinit: looking for a device with mac address $PRIMARY_MAC"
+    echo "pl_netinit: looking for a device with mac address $NET_DEVICE"
 
-    pushd .
-    cd /sys/class/net
+    pushd /sys/class/net
     for device in *; do
        dev_address=`cat $device/address`
-       if [[ "$dev_address" == "$PRIMARY_MAC" ]]; then
+       if [[ "$dev_address" == "$NET_DEVICE" ]]; then
            ETH_DEVICE=$device
            echo "pl_netinit: found device $ETH_DEVICE"
            break
        fi
     done
     popd
-
-elif [[ -n "$PRIMARY_DEV" ]]; then
-    # the user specified a virtual ethernet device to use.
-    ETH_DEVICE=$PRIMARY_DEV
-    echo "pl_netinit: using user specified device $ETH_DEVICE"
-
 else
     ETH_DEVICE=$DEFAULT_NET_DEV
     echo "pl_netinit: using default device $ETH_DEVICE"
@@ -271,13 +259,13 @@ else
 fi
 
 
-# if we couldn't find a device (would happen if PRIMARY_MAC was specified
+# if we couldn't find a device (would happen if NET_DEVICE was specified
 # but we couldn't find a device for that addresS), then abort the rest
 # of the startup
 
 if [[ -z "$ETH_DEVICE" ]]; then
     echo "pl_netinit: unable to find a usable device, check to make sure"
-    echo "pl_netinit: the PRIMARY_MAC field in the configuration file"
+    echo "pl_netinit: the NET_DEVICE field in the configuration file"
     echo "pl_netinit: cooresponds with a network adapter on this system"
     net_init_failed
 fi
@@ -286,9 +274,15 @@ fi
 # actually check to make sure ifconfig <device> succeeds
 /sbin/ifconfig $ETH_DEVICE up 2>&1 > /dev/null
 if [[ $? -ne 0 ]]; then
-    echo "pl_netinit: device $ETH_DEVICE does not exist,"
-    echo "pl_netinit: this is due to either the device not existing,"
-    echo "pl_netinit: or its device drivers not being loaded"
+    echo "pl_netinit: device $ETH_DEVICE does not exist, most likely"
+    echo "pl_netinit: this cd does not have hardware support for your"
+    echo "pl_netinit: network adapter. please send the following lines"
+    echo "pl_netinit: to PlanetLab Support: support@planet-lab.org"
+    echo "pl_netinit: for further assistance"
+    echo
+    /sbin/lspci -n | /bin/grep "Class 0200"    
+    echo
+
     net_init_failed
 fi
 
@@ -310,7 +304,7 @@ if [[ "$IP_METHOD" == "dhcp" ]]; then
        /sbin/dhclient -1 -cf $DHCLIENT_CONF_FILE $ETH_DEVICE 
        if [[ $? -ne 0 ]]; then
            echo "pl_netinit: dhcp failed, retrying in 2 minutes"
-           /sbin/sleep 120
+           /bin/sleep 120
        else
            echo "pl_netinit: dhcp succeeded"
            configured=1