diff options
| author |   Christian Heim <phreak@gentoo.org> | 2006-02-23 13:39:22 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2006-02-23 13:39:22 +0000 |
| commit | a2c749b6b0e3e3fc03edf067486d950d494a9ff3 (patch) | |
| tree | 0ae717a18dc285e9aee74b77d583ac1fe21eb99d /net-scripts/net.modules.d/netplugd | |
| parent | Merging r1909 (diff) | |
| download | baselayout-vserver-a2c749b6b0e3e3fc03edf067486d950d494a9ff3.tar.gz baselayout-vserver-a2c749b6b0e3e3fc03edf067486d950d494a9ff3.tar.bz2 baselayout-vserver-a2c749b6b0e3e3fc03edf067486d950d494a9ff3.zip | |
Merging baselayout r1924
svn path=/baselayout-vserver/trunk/; revision=252
Diffstat (limited to 'net-scripts/net.modules.d/netplugd')
| -rw-r--r-- | net-scripts/net.modules.d/netplugd | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net-scripts/net.modules.d/netplugd b/net-scripts/net.modules.d/netplugd index a079c3f..109e569 100644 --- a/net-scripts/net.modules.d/netplugd +++ b/net-scripts/net.modules.d/netplugd @@ -29,7 +29,7 @@ netplugd_check_installed() { # # Start netplug on an interface netplugd_pre_start() { - local iface="$1" timeout i + local iface="$1" timeout local pidfile="/var/run/netplugd.${iface}.pid" # We don't start netplug if we're being called from the background @@ -82,7 +82,7 @@ netplugd_pre_start() { veinfo "Waiting for ${iface} to be marked as started" - i=0 + local i=0 while true ; do if service_started "net.${iface}"; then local addr=$( interface_get_address "${iface}" ) @@ -90,6 +90,7 @@ netplugd_pre_start() { exit 0 fi sleep 1 + [[ ${timeout} == "0" ]] && continue (( i++ )) [[ ${i} == "${timeout}" || ${i} -gt "${timeout}" ]] && break done |