From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 23 Jul 2020 12:18:24 +0000 (+0900)
Subject: network: check at least one dynamic address is assigned when DHCP is enabled
X-Git-Tag: v246~14^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15797d6a2be870279c3a45f0e5ce010a4581998d;p=thirdparty%2Fsystemd.git

network: check at least one dynamic address is assigned when DHCP is enabled
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 8adeca7eb2f..894b55f4c5d 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1183,8 +1183,10 @@ void link_check_ready(Link *link) {
                         return;
                 }
 
-                if ((link_dhcp4_enabled(link) || link_dhcp6_enabled(link)) && set_isempty(link->addresses)) {
-                        log_link_debug(link, "%s(): DHCP4 or DHCP6 is enabled but no address is assigned yet.", __func__);
+                if ((link_dhcp4_enabled(link) || link_dhcp6_enabled(link)) &&
+                    !link->dhcp_address && set_isempty(link->dhcp6_addresses) && set_isempty(link->ndisc_addresses) &&
+                    !(link_ipv4ll_enabled(link, ADDRESS_FAMILY_FALLBACK_IPV4) && link->ipv4ll_address_configured)) {
+                        log_link_debug(link, "%s(): DHCP4 or DHCP6 is enabled but no dynamic address is assigned yet.", __func__);
                         return;
                 }