X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=initscripts%2Fpl_netinit;h=16dc26766bcd6d7262b8d25dbf7b5e3528b700db;hb=ae61a3888c7c71e9ce80073ec0254e74d7544f5f;hp=4e6b770cd4c1c15d20919be7a2dc5546cd8c2450;hpb=fd85a905ec4b0e4810adf053d9bdcd6c22d23f98;p=bootcd.git

diff --git a/initscripts/pl_netinit b/initscripts/pl_netinit
index 4e6b770..16dc267 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,7 +126,7 @@ find_node_config()
     # devices
     shopt -s nullglob
 
-    for device in /sys/block/[hs]d*; do
+    for device in /sys/block/[hsv]d*; do
 	removable=$(cat $device/removable)
 	if [[ $removable -ne 1 ]]; then
 	    continue
@@ -290,10 +288,9 @@ fi
 /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 $(date "+%H:%M:%S") " pl_netinit: to your PlanetLab support for further assistance"
     echo
     /sbin/lspci -n | /bin/grep "Class 0200"    
     echo