aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Macku <jamacku@redhat.com>2020-01-29 12:58:19 +0100
committerLukáš Nykrýn <lnykryn@redhat.com>2020-03-24 11:47:43 +0100
commit4e2400798397ae2567a8cfd824c14ccd41983b08 (patch)
tree80f68cf6d4cee2e0b339833c98a2205bb2b23445
parent78d63a837ca18cd88f6b79e11211805bea05cf0d (diff)
downloadinitscripts-4e2400798397ae2567a8cfd824c14ccd41983b08.tar
initscripts-4e2400798397ae2567a8cfd824c14ccd41983b08.tar.gz
initscripts-4e2400798397ae2567a8cfd824c14ccd41983b08.tar.bz2
initscripts-4e2400798397ae2567a8cfd824c14ccd41983b08.tar.xz
initscripts-4e2400798397ae2567a8cfd824c14ccd41983b08.zip
Wait for scope link addresses as well as for scope global addresses
Resolves: rhbz#1773798
-rw-r--r--network-scripts/network-functions-ipv66
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