emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[oldnet] Bug #363959: Improve plug_timeout ifplugd/netplugd code.

Browse Source 
- 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>
This commit is contained in:
Robin H. Johnson 2011-04-19 17:17:53 +00:00
parent b6409feaac
commit 2d197357ef
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/net.example.Linux.in
View File

@ -975,10 +975,12 @@
# and you're done :) # and you're done :)
# By default we don't wait for netplug/ifplugd to configure the interface. # By default we don't wait for netplug/ifplugd to configure the interface.
# If you would like it to wait so that other services know that network is up # If you would like it to wait so that other services know that network is
# then you can specify a timeout here. # up then you can specify a timeout here. A value of 0 means wait forever,
# and a negative value means never wait.
#plug_timeout_eth0="10"
# If you want to set it for all interfaces:
#plug_timeout="10" #plug_timeout="10"
# A value of 0 means wait forever.
# If you don't want to use netplug on a specific interface but you have it # If you don't want to use netplug on a specific interface but you have it
# installed, you can disable it for that interface via the modules statement # installed, you can disable it for that interface via the modules statement

2
net/ifplugd.sh
View File

@ -51,7 +51,9 @@ ifplugd_pre_start()
eindent eindent
# IFACE-specific, then global, then default
eval timeout=\$plug_timeout_${IFVAR} eval timeout=\$plug_timeout_${IFVAR}
[ -z "${timeout}" ] && timeout=$plug_timeout
[ -z "${timeout}" ] && timeout=-1 [ -z "${timeout}" ] && timeout=-1
if [ ${timeout} -eq 0 ]; then if [ ${timeout} -eq 0 ]; then
ewarn "WARNING: infinite timeout set for ${IFACE} to come up" ewarn "WARNING: infinite timeout set for ${IFACE} to come up"

2
net/netplugd.sh
View File

@ -53,7 +53,9 @@ netplugd_pre_start()
eindent eindent
# IFACE-specific, then global, then default
eval timeout=\$plug_timeout_${IFVAR} eval timeout=\$plug_timeout_${IFVAR}
[ -z "${timeout}" ] && timeout=$plug_timeout
[ -z "${timeout}" ] && timeout=-1 [ -z "${timeout}" ] && timeout=-1
if [ ${timeout} -eq 0 ]; then if [ ${timeout} -eq 0 ]; then
ewarn "WARNING: infinite timeout set for ${IFACE} to come up" ewarn "WARNING: infinite timeout set for ${IFACE} to come up"