From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 6 Jun 2021 06:24:43 +0000 (+0900)
Subject: network: apply activation policy only when it is once activated
X-Git-Tag: v249-rc1~60^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=899b0e5eec5196ecc13e19ea90a247633bfef3d8;p=thirdparty%2Fsystemd.git

network: apply activation policy only when it is once activated

Otherwise, e.g., if activation policy is always-up is set for bond
slave, then setting bond configuration may fail.
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index d970cd7a155..a894ef6e3b6 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1567,7 +1567,7 @@ static int link_admin_state_up(Link *link) {
         if (!link->network)
                 return 0;
 
-        if (link->network->activation_policy == ACTIVATION_POLICY_ALWAYS_DOWN) {
+        if (link->activated && link->network->activation_policy == ACTIVATION_POLICY_ALWAYS_DOWN) {
                 log_link_info(link, "ActivationPolicy is \"always-off\", forcing link down");
                 return link_down(link);
         }
@@ -1587,7 +1587,7 @@ static int link_admin_state_down(Link *link) {
         if (!link->network)
                 return 0;
 
-        if (link->network->activation_policy == ACTIVATION_POLICY_ALWAYS_UP) {
+        if (link->activated && link->network->activation_policy == ACTIVATION_POLICY_ALWAYS_UP) {
                 log_link_info(link, "ActivationPolicy is \"always-on\", forcing link up");
                 return link_up(link);
         }