From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 22 Aug 2021 21:16:48 +0000 (+0900)
Subject: path-util: make find_executable() work without /proc mounted
X-Git-Tag: v250-rc1~777^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93413acd3ef3a637a0f31a1d133b103e1dc81fd6;p=thirdparty%2Fsystemd.git

path-util: make find_executable() work without /proc mounted

Follow-up for 888f65ace6296ed61285d31db846babf1c11885e.

Hopefully fixes #20514.
---

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index d11f254a9f6..a21981616b5 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -630,7 +630,11 @@ static int check_x_access(const char *path, int *ret_fd) {
                 return r;
 
         r = access_fd(fd, X_OK);
-        if (r < 0)
+        if (r == -ENOSYS) {
+                /* /proc is not mounted. Fallback to access(). */
+                if (access(path, X_OK) < 0)
+                        return -errno;
+        } else if (r < 0)
                 return r;
 
         if (ret_fd)