shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-30 14:55:37 +03:00
Code

network: do not drop foreign configs for loopback and critical interfaces on carrier lost

Browse Source
This commit is contained in:
Yu Watanabe 2021-06-14 07:13:58 +09:00
parent 6bfa06fc39
commit 5e3bb5da98
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/network/networkd-link.c
View File

@ -1005,6 +1005,16 @@ static int link_drop_foreign_config(Link *link) {
assert(link); assert(link);
assert(link->manager); assert(link->manager);
/* Drop foreign config, but ignore unmanaged, loopback, or critical interfaces. We do not want
* to remove loopback address or addresses used for root NFS. */
if (IN_SET(link->state, LINK_STATE_UNMANAGED, LINK_STATE_PENDING, LINK_STATE_INITIALIZED))
return 0;
if (FLAGS_SET(link->flags, IFF_LOOPBACK))
return 0;
if (link->network->keep_configuration == KEEP_CONFIGURATION_YES)
return 0;
r = link_drop_foreign_routes(link); r = link_drop_foreign_routes(link);
k = link_drop_foreign_nexthops(link); k = link_drop_foreign_nexthops(link);
@ -1157,14 +1167,9 @@ static int link_configure(Link *link) {
if (r < 0) if (r < 0)
return r; return r;
/* Drop foreign config, but ignore loopback or critical devices. r = link_drop_foreign_config(link);
* We do not want to remove loopback address or addresses used for root NFS. */ if (r < 0)
if (!(link->flags & IFF_LOOPBACK) && return r;
link->network->keep_configuration != KEEP_CONFIGURATION_YES) {
r = link_drop_foreign_config(link);
if (r < 0)
return r;
}
r = link_request_static_configs(link); r = link_request_static_configs(link);
if (r < 0) if (r < 0)
@ -1622,14 +1627,7 @@ static int link_carrier_lost(Link *link) {
if (r < 0) if (r < 0)
return r; return r;
if (!IN_SET(link->state, LINK_STATE_UNMANAGED, LINK_STATE_PENDING, LINK_STATE_INITIALIZED)) { return link_drop_foreign_config(link);
log_link_debug(link, "State is %s, dropping foreign config", link_state_to_string(link->state));
r = link_drop_foreign_config(link);
if (r < 0)
return r;
}
return 0;
} }
static int link_admin_state_up(Link *link) { static int link_admin_state_up(Link *link) {