From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 27 Nov 2024 09:21:23 +0000 (+0100)
Subject: nspawn: improve error message when we cannot look into a container tree due to perms
X-Git-Tag: v257-rc3~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d79ba8574b8bc82b97e30bb5e60fedaf34d43c85;p=thirdparty%2Fsystemd.git

nspawn: improve error message when we cannot look into a container tree due to perms
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 81531ac173f..500725d35f6 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -6200,9 +6200,12 @@ static int run(int argc, char *argv[]) {
                                 goto finish;
                         }
 
-                        if (access_nofollow(p, F_OK) < 0) {
-                                r = log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                                    "Directory %s doesn't look like it has an OS tree (/usr/ directory is missing). Refusing.", arg_directory);
+                        r = access_nofollow(p, F_OK);
+                        if (r == -ENOENT) {
+                                log_error_errno(r, "Directory %s doesn't look like it has an OS tree (/usr/ directory is missing). Refusing.", arg_directory);
+                                goto finish;
+                        } else if (r < 0) {
+                                log_error_errno(r, "Unable to determine if %s looks like it has an OS tree (i.e. whether /usr/ exists): %m", arg_directory);
                                 goto finish;
                         }
                 }