]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: update address when static address was already configured by DHCP
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 17 Jan 2019 05:15:46 +0000 (14:15 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 17 Jan 2019 05:16:21 +0000 (14:16 +0900)
Fixes #11458.

src/network/networkd-link.c

index 3661498f391d4c2919fa1b82a9ab8a33dd85ac12..e767f5d60a1be8bb895193f6cf5f95f25666e533 100644 (file)
@@ -1095,7 +1095,11 @@ static int link_request_set_addresses(Link *link) {
                 return r;
 
         LIST_FOREACH(addresses, ad, link->network->static_addresses) {
-                r = address_configure(ad, link, address_handler, false);
+                bool update;
+
+                update = address_get(link, ad->family, &ad->in_addr, ad->prefixlen, NULL) > 0;
+
+                r = address_configure(ad, link, address_handler, update);
                 if (r < 0) {
                         log_link_warning_errno(link, r, "Could not set addresses: %m");
                         link_enter_failed(link);