diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2013-08-28 09:00:33 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2013-08-28 09:00:33 -0700 |
commit | 732a9a4999f479ee97a404252f6a0eba4a86e338 (patch) | |
tree | 645678bd1814f5511b98c7d13e47aaa0bd67af10 | |
parent | fixed paths for arping tool due to ~arch iputils path migration, bug 458090 (diff) | |
download | netifrc-732a9a4999f479ee97a404252f6a0eba4a86e338.tar.gz netifrc-732a9a4999f479ee97a404252f6a0eba4a86e338.tar.bz2 netifrc-732a9a4999f479ee97a404252f6a0eba4a86e338.zip |
net/iproute2: increase default dad_timeout to 10s
If you have a NIC that takes a long time to come up, the previous
default of 5 seconds is too low, because the card might not be available
yet. Increase the default to 10 seconds.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Gentoo-Bug: 482300
-rw-r--r-- | doc/net.example.BSD.in | 12 | ||||
-rw-r--r-- | doc/net.example.Linux.in | 10 | ||||
-rw-r--r-- | net/iproute2.sh | 2 |
3 files changed, 14 insertions, 10 deletions
diff --git a/doc/net.example.BSD.in b/doc/net.example.BSD.in index 2509c9f..d3bd15b 100644 --- a/doc/net.example.BSD.in +++ b/doc/net.example.BSD.in @@ -86,12 +86,14 @@ # IPv6 addresses usually must complete a duplicate address detection process # before they can be bound to by daemons; they are held in a 'tentative' state -# until this completes. Setting the 'nodad' flag (see config_eth0 above) is +# until this completes. Setting the 'nodad' flag (see config_eth0 above) is # one way to avoid this tentative state, otherwise the service will wait -# dad_timeout seconds (defaults to 5) for tentative state to clear on all IPv6 -# addresses set on the interface. As usual, dad_timeout can be adjusted on a -# per-interface basis. Set to 0 to disable the wait entirely. -#dad_timeout_eth0=5 +# dad_timeout seconds (defaults to 10) for tentative state to clear on all IPv6 +# addresses set on the interface. As usual, dad_timeout can be adjusted on a +# per-interface basis. If your interface takes a long time to establish +# carrier, you may wish to use a higher value. +# Set to 0 to disable the wait entirely. +#dad_timeout_eth0=10 # You may wish to disable the interface being brought down when stopping. # This is only of use for WakeOnLan. diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in index caffed7..e838f28 100644 --- a/doc/net.example.Linux.in +++ b/doc/net.example.Linux.in @@ -137,10 +137,12 @@ # before they can be bound to by daemons; they are held in a 'tentative' state # until this completes. Setting the 'nodad' flag (see config_eth0 above) is # one way to avoid this tentative state, otherwise the service will wait -# dad_timeout seconds (defaults to 5) for tentative state to clear on all IPv6 -# addresses set on the interface. As usual, dad_timeout can be adjusted on a -# per-interface basis. Set to 0 to disable the wait entirely. -#dad_timeout_eth0=5 +# dad_timeout seconds (defaults to 10) for tentative state to clear on all IPv6 +# addresses set on the interface. As usual, dad_timeout can be adjusted on a +# per-interface basis. If your interface takes a long time to establish +# carrier, you may wish to use a higher value. +# Set to 0 to disable the wait entirely. +#dad_timeout_eth0=10 # You may wish to disable the interface being brought down when stopping. # This is only of use for WakeOnLan. diff --git a/net/iproute2.sh b/net/iproute2.sh index 58b7bc4..096e724 100644 --- a/net/iproute2.sh +++ b/net/iproute2.sh @@ -332,7 +332,7 @@ iproute2_post_start() { local n= eval n=\$dad_timeout_${IFVAR} - [ -z "$n" ] && n=${dad_timeout:-5} + [ -z "$n" ] && n=${dad_timeout:-10} local policyroute_order= eval policyroute_order=\$policy_rules_before_routes_${IFVAR} |