diff options
| author | Jan Macku <jamacku@redhat.com> | 2020-04-14 16:28:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 16:28:56 +0200 |
| commit | fb773f3543972e6b6898938e2840c26991a10d1c (patch) | |
| tree | 17c55446af6c5decc45db75d97a7e5d9a2473f8c | |
| parent | c4943660331ca6a30f6cf2bcf8465852e2c8efb0 (diff) | |
| download | initscripts-fb773f3543972e6b6898938e2840c26991a10d1c.tar initscripts-fb773f3543972e6b6898938e2840c26991a10d1c.tar.gz initscripts-fb773f3543972e6b6898938e2840c26991a10d1c.tar.bz2 initscripts-fb773f3543972e6b6898938e2840c26991a10d1c.tar.xz initscripts-fb773f3543972e6b6898938e2840c26991a10d1c.zip | |
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
| -rw-r--r-- | network-scripts/network-functions-ipv6 | 6 |
1 files 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 |