SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: drop configurations in the previous .network file when entering unmanaged state

Browse Source 
When reconfiguring an interface and it will enter unmanaged state,
let's drop configurations from the previously assigned .network file.
This commit is contained in:
Yu Watanabe
2021-08-10 14:44:39 +09:00
parent 5e3bb5da98
commit cb71e9c606
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-link.c
+11 -7
View File
@@ -1235,23 +1235,22 @@ static int link_get_network(Link *link, Network **ret) {
}
static int link_reconfigure_impl(Link *link, bool force) {
Network *network;
Network *network = NULL;
int r;
assert(link);
r = link_get_network(link, &network);
if (r == -ENOENT) {
link_set_state(link, LINK_STATE_UNMANAGED);
return 0;
}
if (r < 0)
if (r < 0 && r != -ENOENT)
return r;
if (link->network == network && !force)
return 0;
log_link_info(link, "Re-configuring with %s", network->filename);
if (network)
log_link_info(link, "Reconfiguring with %s.", network->filename);
else
log_link_info(link, "Unmanaging interface.");
/* Dropping old .network file */
r = link_stop_engines(link, false);
@@ -1269,6 +1268,11 @@ static int link_reconfigure_impl(Link *link, bool force) {
link->network = network_unref(link->network);
link_unref(set_remove(link->manager->links_requesting_uuid, link));
if (!network) {
link_set_state(link, LINK_STATE_UNMANAGED);
return 0;
}
/* Then, apply new .network file */
link->network = network_ref(network);
link_update_operstate(link, true);