network:dhcp:wait_for_ipv6_dad() in PREINIT6

2015-05-07 14:42:10 +02:00 · 2015-05-07 14:42:10 +02:00 · 7c5ec0f5be
parent 6d58fa27a4
commit 7c5ec0f5be
2 changed files with 3 additions and 2 deletions
--- a/modules.d/40network/dhclient-script.sh
+++ b/modules.d/40network/dhclient-script.sh
@ -93,8 +93,9 @@ case $reason in
        ;;

    PREINIT6)
-        echo "dhcp: PREINIT $netif up"
+        echo "dhcp: PREINIT6 $netif up"
        linkup $netif
+        wait_for_ipv6_dad $netif
        ;;

    BOUND)
--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
@ -520,7 +520,7 @@ wait_for_ipv6_dad() {
    local cnt=0
    local li
    while [ $cnt -lt 500 ]; do
-        li=$(ip -6 addr show dev $1)
+        li=$(ip -6 addr show dev $1 scope link)
        strstr "$li" "tentative" || return 0
        sleep 0.1
        cnt=$(($cnt+1))