]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network/dhcp6: skip to check existence of DHCPv6 address when UseAddress=no
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 10 Nov 2023 17:30:20 +0000 (02:30 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 10 Nov 2023 18:30:34 +0000 (03:30 +0900)
Follow-up for 1536b7b2d00819615bf8eba194de7ccd20c3689f and
5f950e56211a90b21e8096ebf27c9c2b8afbd231.

Fixes #29979.

src/network/networkd-dhcp6.c

index 6d38840ccb587435016c8daf02a296a3da524c37..ee20d0ed50a6ba29f52b2b6ee78f11b0badb1442 100644 (file)
@@ -99,13 +99,15 @@ int dhcp6_check_ready(Link *link) {
         int r;
 
         assert(link);
+        assert(link->network);
 
         if (link->dhcp6_messages > 0) {
                 log_link_debug(link, "%s(): DHCPv6 addresses and routes are not set.", __func__);
                 return 0;
         }
 
-        if (!link_check_addresses_ready(link, NETWORK_CONFIG_SOURCE_DHCP6)) {
+        if (link->network->dhcp6_use_address &&
+            !link_check_addresses_ready(link, NETWORK_CONFIG_SOURCE_DHCP6)) {
                 Address *address;
 
                 SET_FOREACH(address, link->addresses)