From 7b58642dc59c4c5ec7f29b3067a17f129ab08035 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Wed, 11 Mar 2020 17:45:57 +0100
Subject: [PATCH] Wait for scope link addresses as well as for scope global
 addresses

Fix issue when interface has assigned only local address in tentative
state and DHCPv6 isn't able to assign address to that interface.
With this patch network-scripts will wait until tentative state is gone (wait for DAD)
for all scopes including local one.

Resolves: #1809601
---
 network-scripts/network-functions-ipv6 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/network-scripts/network-functions-ipv6 b/network-scripts/network-functions-ipv6
index b5b3e939..2f7b19b8 100644
--- a/network-scripts/network-functions-ipv6
+++ b/network-scripts/network-functions-ipv6
@@ -1058,7 +1058,7 @@ ipv6_wait_tentative() {
     [ "$device" = lo ] && return 0
 
     while [ ${countdown} -gt 0 ]; do
-        ip_output="$(ip -6 addr show dev ${device} scope global tentative)"
+        ip_output="$(ip -6 addr show dev ${device} tentative)"
 
         if [ -z "$ip_output" ]; then
             return 0;
@@ -1073,11 +1073,11 @@ ipv6_wait_tentative() {
         countdown=$(($countdown - 1))
     done
 
-    ip_output="$(ip -6 addr show dev ${device} scope global tentative)"
+    ip_output="$(ip -6 addr show dev ${device} tentative)"
 
     if [ -n "$ip_output" ]; then
         net_log $"Some IPv6 address(es) of ${device} remain still in 'tentative' state" warning $fn
-        net_log $"Run 'ip -6 addr show dev ${device} scope global tentative' to see more" warning $fn
+        net_log $"Run 'ip -6 addr show dev ${device} tentative' to see more" warning $fn
     fi
 
     return 0