diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2013-08-22 11:32:18 -0400 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2013-08-22 11:32:18 -0400 |
| commit | 8a958b68a2622770bd6fd13e6a0bc50087fb50f2 (patch) | |
| tree | cb4c79ffe879c35a4c324afe805bd2613ee9f139 /net | |
| parent | rename package to netifrc (diff) | |
| download | netifrc-8a958b68a2622770bd6fd13e6a0bc50087fb50f2.tar.gz netifrc-8a958b68a2622770bd6fd13e6a0bc50087fb50f2.tar.bz2 netifrc-8a958b68a2622770bd6fd13e6a0bc50087fb50f2.zip | |
drop _has_carrier check from ipv6_tentative since it doesn't do what we expect, and add new dad_timeout option defaulting to 5s for bug 481970
Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/iproute2.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/iproute2.sh b/net/iproute2.sh index 3bab7b7..d8e8b8b 100644 --- a/net/iproute2.sh +++ b/net/iproute2.sh @@ -286,15 +286,15 @@ iproute2_pre_start() _iproute2_ipv6_tentative() { - # Only check tentative when we have a carrier. - _has_carrier || return 1 LC_ALL=C ip addr show dev "${IFACE}" | \ grep -q "^[[:space:]]*inet6 .* tentative" } iproute2_post_start() { - local n=5 + local n= + eval n=\$dad_timeout_${IFVAR} + [ -z "$n" ] && n=${dad_timeout:-5} # Kernel may not have IP built in if [ -e /proc/net/route ]; then |