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 885303a2c45753a39c5e4a6eae7035db33e132cd..aef94d6c52b8dd2f67abb75eef83d4e090852069 100755 (executable)
--- a/modules.d/40network/dhclient-script.sh
+++ b/modules.d/40network/dhclient-script.sh
@@ -95,8 +95,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 89b1101df1f06e833c320514c18c012749bf1d5e..220480b223f69a3c53c2f86648fdbebb4c2aa8a9 100755 (executable)
--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
@@ -522,7 +522,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))