diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-01-26 15:41:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-26 15:41:06 +0100 |
| commit | 7c45deb20d4b28a928e0af089b1b18c2118db1e0 (patch) | |
| tree | 078fe8aa35e10332221827ceeace29d661370a87 /src | |
| parent | 064605ef5646a455a4272850b5f648abb9754a40 (diff) | |
| parent | 30d3b54ebad41082e99cabbee815cb113aa0b5c4 (diff) | |
| download | systemd-7c45deb20d4b28a928e0af089b1b18c2118db1e0.tar.gz | |
Merge pull request #11460 from yuwata/fix-11458
network: update address when static address was already configured by DHCP
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/networkd-link.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 555e90f5ce..736373ae34 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1101,7 +1101,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); |