Merge pull request #17143 from keszybz/late-exec-resolution-alt

[thirdparty/systemd.git] / src / basic / fd-util.c

diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index 3b2f93a073655b31e1c26531c2562995fea3ceeb..db869cbd5499a8827e8bb72ae5d519a0a45663cb 100644 (file)
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -385,11 +385,9 @@ int fd_get_path(int fd, char **ret) {
                 /* ENOENT can mean two things: that the fd does not exist or that /proc is not mounted. Let's make
                  * things debuggable and distinguish the two. */
 
-                if (access("/proc/self/fd/", F_OK) < 0)
-                        /* /proc is not available or not set up properly, we're most likely in some chroot
-                         * environment. */
-                        return errno == ENOENT ? -EOPNOTSUPP : -errno;
-
+                if (proc_mounted() == 0)
+                        return -ENOSYS;  /* /proc is not available or not set up properly, we're most likely in some chroot
+                                          * environment. */
                 return -EBADF; /* The directory exists, hence it's the fd that doesn't. */
         }