From 2d197357ef9b92c6a237b438723c2969b51a802d Mon Sep 17 00:00:00 2001
From: "Robin H. Johnson" <robbat2@gentoo.org>
Date: Tue, 19 Apr 2011 17:17:53 +0000
Subject: [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>
---
 net/ifplugd.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'net/ifplugd.sh')

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"
-- 
cgit v1.2.3