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

oldnet/iproute2.sh: fix carrier detection

Browse Source 
We were not testing for carrier correctly when testing for ipv6
tentative addresses.

Reported-by: <ast@domdv.de>
X-Gentoo-Bug: 433012
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=433012
This commit is contained in:
William Hubbs 2012-09-07 14:29:56 -05:00
parent 8e4169e29e
commit 444bdfbfc4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/iproute2.sh
View File

@ -212,7 +212,7 @@ _delete_addresses()
_has_carrier() _has_carrier()
{ {
return 0 LC_ALL=C ip link show dev "${IFACE}" | grep -q "LOWER_UP"
} }
_tunnel() _tunnel()
@ -287,7 +287,7 @@ iproute2_pre_start()
_iproute2_ipv6_tentative() _iproute2_ipv6_tentative()
{ {
# Only check tentative when we have a carrier. # Only check tentative when we have a carrier.
LC_ALL=C ip link show dev "${IFACE}" | grep -q "NO-CARRIER" && return 1 _has_carrier || return 1
LC_ALL=C ip addr show dev "${IFACE}" | \ LC_ALL=C ip addr show dev "${IFACE}" | \
grep -q "^[[:space:]]*inet6 .* tentative" grep -q "^[[:space:]]*inet6 .* tentative"
} }