From d79ba8574b8bc82b97e30bb5e60fedaf34d43c85 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 27 Nov 2024 10:21:23 +0100 Subject: [PATCH] nspawn: improve error message when we cannot look into a container tree due to perms --- src/nspawn/nspawn.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 81531ac173..500725d35f 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; } } -- 2.25.1