From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 14 Oct 2021 17:53:52 +0000 (+0900)
Subject: network: add missing DHCPv6PD address check
X-Git-Tag: v250-rc1~478^2~1
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=d9098371dfd1f39f547f1d1371110cd778e063b9;p=systemd%2F.git

network: add missing DHCPv6PD address check
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 7c02110796..3bc417e033 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -486,8 +486,11 @@ void link_check_ready(Link *link) {
                 if (!address_exists(a))
                         continue;
                 if (IN_SET(a->source,
-                           NETWORK_CONFIG_SOURCE_IPV4LL, NETWORK_CONFIG_SOURCE_DHCP4,
-                           NETWORK_CONFIG_SOURCE_DHCP6, NETWORK_CONFIG_SOURCE_NDISC)) {
+                           NETWORK_CONFIG_SOURCE_IPV4LL,
+                           NETWORK_CONFIG_SOURCE_DHCP4,
+                           NETWORK_CONFIG_SOURCE_DHCP6,
+                           NETWORK_CONFIG_SOURCE_DHCP6PD,
+                           NETWORK_CONFIG_SOURCE_NDISC)) {
                         has_dynamic_address = true;
                         break;
                 }
@@ -496,7 +499,7 @@ void link_check_ready(Link *link) {
         if ((link_ipv4ll_enabled(link) || link_dhcp4_enabled(link) || link_dhcp6_with_address_enabled(link) ||
              (link_dhcp6_pd_is_enabled(link) && link->network->dhcp6_pd_assign)) && !has_dynamic_address)
                 /* When DHCP[46] or IPv4LL is enabled, at least one address is acquired by them. */
-                return (void) log_link_debug(link, "%s(): DHCPv4, DHCPv6 or IPv4LL is enabled but no dynamic address is assigned yet.", __func__);
+                return (void) log_link_debug(link, "%s(): DHCPv4, DHCPv6, DHCPv6PD or IPv4LL is enabled but no dynamic address is assigned yet.", __func__);
 
         /* Ignore NDisc when ConfigureWithoutCarrier= is enabled, as IPv6AcceptRA= is enabled by default. */
         if (link_ipv4ll_enabled(link) || link_dhcp4_enabled(link) ||