|
 |
8f5114 |
From 7b58642dc59c4c5ec7f29b3067a17f129ab08035 Mon Sep 17 00:00:00 2001
|
|
|
8f5114 |
From: Jan Macku <jamacku@redhat.com>
|
|
|
8f5114 |
Date: Wed, 11 Mar 2020 17:45:57 +0100
|
|
|
8f5114 |
Subject: [PATCH] Wait for scope link addresses as well as for scope global
|
|
|
8f5114 |
addresses
|
|
|
8f5114 |
|
|
|
8f5114 |
Fix issue when interface has assigned only local address in tentative
|
|
|
8f5114 |
state and DHCPv6 isn't able to assign address to that interface.
|
|
|
8f5114 |
With this patch network-scripts will wait until tentative state is gone (wait for DAD)
|
|
|
8f5114 |
for all scopes including local one.
|
|
|
8f5114 |
|
|
|
8f5114 |
Resolves: #1809601
|
|
|
8f5114 |
---
|
|
|
8f5114 |
network-scripts/network-functions-ipv6 | 6 +++---
|
|
|
8f5114 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
8f5114 |
|
|
|
8f5114 |
diff --git a/network-scripts/network-functions-ipv6 b/network-scripts/network-functions-ipv6
|
|
|
8f5114 |
index b5b3e939..2f7b19b8 100644
|
|
|
8f5114 |
--- a/network-scripts/network-functions-ipv6
|
|
|
8f5114 |
+++ b/network-scripts/network-functions-ipv6
|
|
|
8f5114 |
@@ -1058,7 +1058,7 @@ ipv6_wait_tentative() {
|
|
|
8f5114 |
[ "$device" = lo ] && return 0
|
|
|
8f5114 |
|
|
|
8f5114 |
while [ ${countdown} -gt 0 ]; do
|
|
|
8f5114 |
- ip_output="$(ip -6 addr show dev ${device} scope global tentative)"
|
|
|
8f5114 |
+ ip_output="$(ip -6 addr show dev ${device} tentative)"
|
|
|
8f5114 |
|
|
|
8f5114 |
if [ -z "$ip_output" ]; then
|
|
|
8f5114 |
return 0;
|
|
|
8f5114 |
@@ -1073,11 +1073,11 @@ ipv6_wait_tentative() {
|
|
|
8f5114 |
countdown=$(($countdown - 1))
|
|
|
8f5114 |
done
|
|
|
8f5114 |
|
|
|
8f5114 |
- ip_output="$(ip -6 addr show dev ${device} scope global tentative)"
|
|
|
8f5114 |
+ ip_output="$(ip -6 addr show dev ${device} tentative)"
|
|
|
8f5114 |
|
|
|
8f5114 |
if [ -n "$ip_output" ]; then
|
|
|
8f5114 |
net_log $"Some IPv6 address(es) of ${device} remain still in 'tentative' state" warning $fn
|
|
|
8f5114 |
- net_log $"Run 'ip -6 addr show dev ${device} scope global tentative' to see more" warning $fn
|
|
|
8f5114 |
+ net_log $"Run 'ip -6 addr show dev ${device} tentative' to see more" warning $fn
|
|
|
8f5114 |
fi
|
|
|
8f5114 |
|
|
|
8f5114 |
return 0
|