From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 5 Nov 2024 19:42:16 +0000 (+0900)
Subject: network: use path_is_network_fs_harder()
X-Git-Tag: v257-rc1~22^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F35040%2Fhead;p=thirdparty%2Fsystemd.git

network: use path_is_network_fs_harder()

Closes #32426.
---

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 476e02fd28f..38013994c83 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -31,6 +31,7 @@
 #include "fs-util.h"
 #include "initrd-util.h"
 #include "local-addresses.h"
+#include "mount-util.h"
 #include "netlink-util.h"
 #include "network-internal.h"
 #include "networkd-address-label.h"
@@ -59,7 +60,6 @@
 #include "selinux-util.h"
 #include "set.h"
 #include "signal-util.h"
-#include "stat-util.h"
 #include "strv.h"
 #include "sysctl-util.h"
 #include "tclass.h"
@@ -508,9 +508,11 @@ static int manager_set_keep_configuration(Manager *m) {
                 return 0;
         }
 
-        r = path_is_network_fs("/");
-        if (r < 0)
-                return log_error_errno(r, "Failed to detect if root is network filesystem: %m");
+        r = path_is_network_fs_harder("/");
+        if (r < 0) {
+                log_warning_errno(r, "Failed to detect if root is network filesystem, assuming not: %m");
+                return 0;
+        }
         if (r == 0) {
                 m->keep_configuration = _KEEP_CONFIGURATION_INVALID;
                 return 0;