From 2c7b826ddf52bd09956815dd8e52329e62ce985a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 5 Dec 2019 19:54:29 +0900 Subject: [PATCH] network: do not drop foreign config if interface is in initialized state If the interface is in initialized state, no network file is assigned to the interface. If an interface is not managed by networkd, previously, the foreign configs of the interface was dropped. Fixes #14250. --- src/network/networkd-link.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index e650ef7e0a..710de80fde 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -2924,7 +2924,7 @@ int link_reconfigure(Link *link, bool force) { if (r < 0) return r; - if (!IN_SET(link->state, LINK_STATE_UNMANAGED, LINK_STATE_PENDING)) { + if (!IN_SET(link->state, LINK_STATE_UNMANAGED, LINK_STATE_PENDING, LINK_STATE_INITIALIZED)) { log_link_debug(link, "State is %s, dropping config", link_state_to_string(link->state)); r = link_drop_foreign_config(link); if (r < 0) @@ -3419,7 +3419,7 @@ static int link_carrier_lost(Link *link) { if (r < 0) return r; - if (!IN_SET(link->state, LINK_STATE_UNMANAGED, LINK_STATE_PENDING)) { + if (!IN_SET(link->state, LINK_STATE_UNMANAGED, LINK_STATE_PENDING, LINK_STATE_INITIALIZED)) { log_link_debug(link, "State is %s, dropping config", link_state_to_string(link->state)); r = link_drop_foreign_config(link); if (r < 0)