From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 25 Jul 2019 09:16:50 +0000 (+0200)
Subject: nspawn: don't look for .nspawn file above the top-level directory, it makes no sense
X-Git-Tag: v243-rc1~19^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd6e3914f7e30f59e8712fa6c32b72523aa7458b;p=thirdparty%2Fsystemd.git

nspawn: don't look for .nspawn file above the top-level directory, it makes no sense
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 2542888c1e0..de748b9de33 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -4018,7 +4018,7 @@ static int load_settings(void) {
                         p = file_in_same_dir(arg_image, fn);
                         if (!p)
                                 return log_oom();
-                } else if (arg_directory) {
+                } else if (arg_directory && !path_equal(arg_directory, "/")) {
                         p = file_in_same_dir(arg_directory, fn);
                         if (!p)
                                 return log_oom();