From: Harald Hoyer <harald@redhat.com>
Date: Wed, 29 Jun 2016 15:18:46 +0000 (+0200)
Subject: network/net-lib.sh(wait_for_ipv6_dad): simplify ip call
X-Git-Tag: 033-502~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7805d1297645722b1522a48a5588e949e2f3c7c;p=thirdparty%2Fdracut.git

network/net-lib.sh(wait_for_ipv6_dad): simplify ip call

taken from initscripts
---

diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
index 9f767144d..92154cc6a 100755
--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
@@ -624,16 +624,12 @@ wait_for_ipv6_dad() {
 
 wait_for_ipv6_auto() {
     local cnt=0
-    local li
     local timeout="$(getargs rd.net.timeout.ipv6auto=)"
     timeout=${timeout:-40}
     timeout=$(($timeout*10))
 
     while [ $cnt -lt $timeout ]; do
-        li=$(ip -6 addr show dev $1)
-        if ! strstr "$li" "tentative"; then
-            strstr "$li" "dynamic" && return 0
-        fi
+        [ -z "$(ip -6 addr show dev $1 scope global tentative)" ] && return 0
         sleep 0.1
         cnt=$(($cnt+1))
     done