From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 10 May 2022 16:54:48 +0000 (+0900)
Subject: network: refuse to configure anything on pending or initialized state
X-Git-Tag: v252-rc1~505^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8d4db58ca6c76cae06362a56359f77481c4271d;p=thirdparty%2Fsystemd.git

network: refuse to configure anything on pending or initialized state
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 76e0690aefc..7a5bc624155 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -95,6 +95,9 @@ bool link_ipv6_enabled(Link *link) {
 bool link_is_ready_to_configure(Link *link, bool allow_unmanaged) {
         assert(link);
 
+        if (!IN_SET(link->state, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED, LINK_STATE_UNMANAGED))
+                return false;
+
         if (!link->network) {
                 if (!allow_unmanaged)
                         return false;
@@ -102,9 +105,6 @@ bool link_is_ready_to_configure(Link *link, bool allow_unmanaged) {
                 return link_has_carrier(link);
         }
 
-        if (!IN_SET(link->state, LINK_STATE_CONFIGURING, LINK_STATE_CONFIGURED))
-                return false;
-
         if (!link->network->configure_without_carrier) {
                 if (link->set_flags_messages > 0)
                         return false;