diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2011-04-19 17:17:53 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2011-04-19 17:49:20 +0000 |
| commit | 2d197357ef9b92c6a237b438723c2969b51a802d (patch) | |
| tree | 746808c36f80b315f04b8616d1aedb75630663a5 /net | |
| parent | b6409feaac9922e5761ed7beef93bdf0fdf2faf7 (diff) | |
[oldnet] Bug #363959: Improve plug_timeout ifplugd/netplugd code.
- Add support for a global plug_timeout setting to match the
documentation.
- Update the documentation to also show per-interface configuration.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ifplugd.sh | 2 | ||||
| -rw-r--r-- | net/netplugd.sh | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/net/ifplugd.sh b/net/ifplugd.sh index 9f6c8846..34cd18a5 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 8f36ef2d..23b6d9ea 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" |