From: Mike Yuan <me@yhndnzj.com>
Date: Sun, 9 Feb 2025 14:25:05 +0000 (+0100)
Subject: tmpfiles: drop redundant proc_mounted() check
X-Git-Tag: v258-rc1~1372^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8dc4f9a944372ddae9951601215b29196f2c467c;p=thirdparty%2Fsystemd.git

tmpfiles: drop redundant proc_mounted() check

Follow-up for 01131684ac66e82faae18e40e110089003d7c536

After the mentioned commit, the execution of tmpfiles
is aborted without /proc/. No need to check for individual
operations.
---

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 139271623e6..93af0176969 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1479,14 +1479,8 @@ static int fd_set_acls(
                 log_debug_errno(r, "ACLs not supported by file system at %s", path);
                 return 0;
         }
-
         if (r > 0)
                 return -r; /* already warned in path_set_acl */
-
-        /* The above procfs paths don't work if /proc is not mounted. */
-        if (r == -ENOENT && proc_mounted() == 0)
-                r = -ENOSYS;
-
         if (r < 0)
                 return log_error_errno(r, "ACL operation on \"%s\" failed: %m", path);
 #endif