a0a3b4
From 6d22a6860ea22d4b5a78d0328be4524579cece98 Mon Sep 17 00:00:00 2001
a0a3b4
From: Harald Hoyer <harald@redhat.com>
a0a3b4
Date: Thu, 30 Jun 2016 08:52:09 +0200
a0a3b4
Subject: [PATCH] network/net-lib.sh: auto6 wait for route ra
a0a3b4
a0a3b4
Wait for a router advertised route
a0a3b4
---
a0a3b4
 modules.d/40network/net-lib.sh | 4 +++-
a0a3b4
 1 file changed, 3 insertions(+), 1 deletion(-)
a0a3b4
a0a3b4
diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
1755ca
index 98dbbb63..b248133d 100755
a0a3b4
--- a/modules.d/40network/net-lib.sh
a0a3b4
+++ b/modules.d/40network/net-lib.sh
a0a3b4
@@ -659,7 +659,9 @@ wait_for_ipv6_auto() {
a0a3b4
     timeout=$(($timeout*10))
a0a3b4
 
a0a3b4
     while [ $cnt -lt $timeout ]; do
a0a3b4
-        [ -z "$(ip -6 addr show dev $1 scope global tentative)" ] && return 0
a0a3b4
+        [ -z "$(ip -6 addr show dev "$1" scope global tentative)" ] \
a0a3b4
+            && [ -n "$(ip -6 route list proto ra dev "$1")" ] \
a0a3b4
+            && return 0
a0a3b4
         sleep 0.1
a0a3b4
         cnt=$(($cnt+1))
a0a3b4
     done