picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Fixes #11458.
This commit is contained in:
Yu Watanabe 2019-01-17 14:15:46 +09:00
parent fb4986fa95
commit a47a6daebe
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/networkd-link.c
View 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);