--- openrc-0.11.6/net/iproute2.sh 2012-11-30 19:07:33.000000000 +0100 +++ openrc-0.11.6/net/iproute2.sh.new 2012-12-08 16:59:59.000000000 +0100 @@ -280,22 +280,7 @@ local len= eval len=\$txqueuelen_${IFVAR} [ -n "${len}" ] && ip link set dev "${IFACE}" txqueuelen "${len}" - - return 0 -} - -_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 - + # Kernel may not have IP built in if [ -e /proc/net/route ]; then local rules="$(_get_array "rules_${IFVAR}")" @@ -326,6 +311,21 @@ ip -6 route flush table cache dev "${IFACE}" fi + return 0 +} + +_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 + if _iproute2_ipv6_tentative; then ebegin "Waiting for IPv6 addresses" while [ $n -ge 0 ]; do