From: Harald Hoyer <harald@redhat.com>
Date: Thu, 7 May 2015 12:42:10 +0000 (+0200)
Subject: network:dhcp:wait_for_ipv6_dad() in PREINIT6
X-Git-Tag: 042~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c5ec0f5be7fb23c2813d955e76fa602f84ea152;p=thirdparty%2Fdracut.git

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 b2dab90a9..4e8e17f48 100755
--- 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 b777acc1c..60e62200a 100755
--- 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))