From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 29 Apr 2021 23:10:36 +0000 (+0900)
Subject: network: do not bring up CAN interface on configure
X-Git-Tag: v249-rc1~314^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36161cba7ce9227c83d9aa3c9d621ffcca829f56;p=thirdparty%2Fsystemd.git

network: do not bring up CAN interface on configure
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 8b8c3852203..ffaebbbf6d3 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -2739,6 +2739,10 @@ static int link_admin_state_down(Link *link) {
                 return 0;
 
         if (link->network->activation_policy == ACTIVATION_POLICY_ALWAYS_UP) {
+                if (streq_ptr(link->kind, "can") && !link->can_configured)
+                        /* CAN device needs to be down on configure. */
+                        return 0;
+
                 log_link_info(link, "ActivationPolicy is \"always-on\", forcing link up");
                 return link_up(link);
         }