From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 17 Jan 2019 05:15:46 +0000 (+0900)
Subject: network: update address when static address was already configured by DHCP
X-Git-Tag: v241-rc2~13^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a47a6daebe0af26c07d8d423225eb4add110793c;p=thirdparty%2Fsystemd.git

network: update address when static address was already configured by DHCP

Fixes #11458.
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 3661498f391..e767f5d60a1 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -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);