summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/ifplugd.sh2
-rw-r--r--net/netplugd.sh2
2 files changed, 4 insertions, 0 deletions
diff --git a/net/ifplugd.sh b/net/ifplugd.sh
index 9f6c884..34cd18a 100644
--- a/net/ifplugd.sh
+++ b/net/ifplugd.sh
@@ -51,7 +51,9 @@ ifplugd_pre_start()
eindent
+ # IFACE-specific, then global, then default
eval timeout=\$plug_timeout_${IFVAR}
+ [ -z "${timeout}" ] && timeout=$plug_timeout
[ -z "${timeout}" ] && timeout=-1
if [ ${timeout} -eq 0 ]; then
ewarn "WARNING: infinite timeout set for ${IFACE} to come up"
diff --git a/net/netplugd.sh b/net/netplugd.sh
index 8f36ef2..23b6d9e 100644
--- a/net/netplugd.sh
+++ b/net/netplugd.sh
@@ -53,7 +53,9 @@ netplugd_pre_start()
eindent
+ # IFACE-specific, then global, then default
eval timeout=\$plug_timeout_${IFVAR}
+ [ -z "${timeout}" ] && timeout=$plug_timeout
[ -z "${timeout}" ] && timeout=-1
if [ ${timeout} -eq 0 ]; then
ewarn "WARNING: infinite timeout set for ${IFACE} to come up"