]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: do not drop foreign configs based on the previous .network file
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 13 Jun 2021 22:04:18 +0000 (07:04 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 10 Aug 2021 05:43:54 +0000 (14:43 +0900)
`link_drop_foreign_config()` will be called later in link_configure().

src/network/networkd-link.c

index c232a8d6c57093b41c7aa11609558ac68e22bc11..bb5f60a8289243dde6feed20dd1b32d4716986ef 100644 (file)
@@ -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);