From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 13 Jun 2021 22:04:18 +0000 (+0900)
Subject: network: do not drop foreign configs based on the previous .network file
X-Git-Tag: v250-rc1~857^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bfa06fc39655e0d43c87a54eccaa34227b61335;p=thirdparty%2Fsystemd.git

network: do not drop foreign configs based on the previous .network file

`link_drop_foreign_config()` will be called later in link_configure().
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index c232a8d6c57..bb5f60a8289 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1259,13 +1259,6 @@ static int link_reconfigure_impl(Link *link, bool force) {
         if (r < 0)
                 return r;
 
-        if (!IN_SET(link->state, LINK_STATE_UNMANAGED, LINK_STATE_PENDING, LINK_STATE_INITIALIZED)) {
-                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;
-        }
-
         link_free_carrier_maps(link);
         link_free_engines(link);
         link->network = network_unref(link->network);