You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
1.2 KiB
31 lines
1.2 KiB
From 256f9a3f37ea33b94692303dfe10141a333cd744 Mon Sep 17 00:00:00 2001 |
|
From: Lukas Nykryn <lnykryn@redhat.com> |
|
Date: Mon, 18 May 2020 14:47:04 +0200 |
|
Subject: [PATCH] netlib: fix botched backport |
|
|
|
--- |
|
modules.d/40network/net-lib.sh | 4 ++-- |
|
1 file changed, 2 insertions(+), 2 deletions(-) |
|
|
|
diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh |
|
index 3f2fc712..3c08a603 100755 |
|
--- a/modules.d/40network/net-lib.sh |
|
+++ b/modules.d/40network/net-lib.sh |
|
@@ -646,7 +646,7 @@ wait_for_ipv6_dad_link() { |
|
|
|
while [ $cnt -lt $timeout ]; do |
|
[ -n "$(ip -6 addr show dev "$1" scope link)" ] \ |
|
- [ -z "$(ip -6 addr show dev "$1" scope link tentative)" ] \ |
|
+ && [ -z "$(ip -6 addr show dev "$1" scope link tentative)" ] \ |
|
&& return 0 |
|
[ -n "$(ip -6 addr show dev "$1" scope link dadfailed)" ] \ |
|
&& return 1 |
|
@@ -664,7 +664,7 @@ wait_for_ipv6_dad() { |
|
|
|
while [ $cnt -lt $timeout ]; do |
|
[ -n "$(ip -6 addr show dev "$1")" ] \ |
|
- [ -z "$(ip -6 addr show dev "$1" tentative)" ] \ |
|
+ && [ -z "$(ip -6 addr show dev "$1" tentative)" ] \ |
|
&& return 0 |
|
[ -n "$(ip -6 addr show dev "$1" dadfailed)" ] \ |
|
&& return 1
|
|
|