X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=initscripts%2Fpl_netinit;h=16dc26766bcd6d7262b8d25dbf7b5e3528b700db;hb=ae61a3888c7c71e9ce80073ec0254e74d7544f5f;hp=afd4c03902e5ee7e0511c8f0e5db9ec1cf2d3e69;hpb=b5b7d860157f6458aca2d69a30092ecd7fc5a616;p=bootcd.git diff --git a/initscripts/pl_netinit b/initscripts/pl_netinit index afd4c03..16dc267 100755 --- a/initscripts/pl_netinit +++ b/initscripts/pl_netinit @@ -56,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" @@ -67,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 @@ -83,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" @@ -129,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