From: Mike Yuan <me@yhndnzj.com>
Date: Sun, 2 Apr 2023 18:20:32 +0000 (+0800)
Subject: networkctl: check netns only if networkd is running
X-Git-Tag: v254-rc1~429^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c6930077cdc705b3c2f5b28aa0af7c49e16fade;p=thirdparty%2Fsystemd.git

networkctl: check netns only if networkd is running
---

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 9b21afe405b..5ef3cbabec8 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -120,12 +120,12 @@ static int acquire_bus(sd_bus **ret) {
         if (r < 0)
                 return log_error_errno(r, "Failed to connect system bus: %m");
 
-        r = check_netns_match(bus);
-        if (r < 0)
-                return r;
-
-        if (!networkd_is_running())
-                fprintf(stderr, "WARNING: systemd-networkd is not running, output will be incomplete.\n\n");
+        if (networkd_is_running()) {
+                r = check_netns_match(bus);
+                if (r < 0)
+                        return r;
+        } else
+                log_warning("systemd-networkd is not running, output might be incomplete.");
 
         *ret = TAKE_PTR(bus);
         return 0;