network:dhcp:wait_for_ipv6_dad() in PREINIT6

diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh
index b2dab90a9e7f916a08021f6772bdf009556e6adf..4e8e17f48e816e36f00a51391461c479d2c87bf3 100755 (executable)
--- 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)

diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
index b777acc1c43aa38b1e700ef236e09bd79d129215..60e62200adeffcf8809db00a733a56d027647253 100755 (executable)
--- 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))