fab351
From 3468310486d0da8d2a6c6bdcddc598b7b8ce5587 Mon Sep 17 00:00:00 2001
fab351
From: Lukas Nykryn <lnykryn@redhat.com>
fab351
Date: Tue, 4 Feb 2020 14:18:01 +0100
fab351
Subject: [PATCH] Revert "wait for IPv6 RA if using none/static IPv6
fab351
 assignment"
fab351
fab351
This reverts commit c603419030136570b5944dc4620f62d07b9e82bb.
fab351
fab351
wait_for_ipv6_dad_link is only called from dhclient script,
fab351
so the original intent "wait for IPv6 RA if using none/static IPv6 assignment"
fab351
does not seem to be correct.
fab351
fab351
Anyway, this brings an issue on isolated networks, where you don't
fab351
have any routes outside. dhclient-script hangs on this check
fab351
and after it times out, dhclient is able to set the address normally.
fab351
fab351
(cherry picked from commit 76f6566fd777e0ee20416061ecb795e8daef33e1)
fab351
fab351
Resolves: #1795276
fab351
---
fab351
 modules.d/40network/net-lib.sh | 1 -
fab351
 1 file changed, 1 deletion(-)
fab351
fab351
diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
fab351
index dcb53804..0f3ca6a8 100755
fab351
--- a/modules.d/40network/net-lib.sh
fab351
+++ b/modules.d/40network/net-lib.sh
fab351
@@ -655,7 +655,6 @@ wait_for_ipv6_dad_link() {
fab351
     while [ $cnt -lt $timeout ]; do
fab351
         [ -n "$(ip -6 addr show dev "$1" scope link)" ] \
fab351
             && [ -z "$(ip -6 addr show dev "$1" scope link tentative)" ] \
fab351
-            && [ -n "$(ip -6 route list proto ra dev "$1" | grep ^default)" ] \
fab351
             && return 0
fab351
         [ -n "$(ip -6 addr show dev "$1" scope link dadfailed)" ] \
fab351
             && return 1
fab351