diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-07-25 11:16:50 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2019-07-29 09:52:02 +0200 |
| commit | cd6e3914f7e30f59e8712fa6c32b72523aa7458b (patch) | |
| tree | aaa2d31df203cd750e75f5e218934ab07c64c86e /src/nspawn | |
| parent | b35ca61ae27172a453faf6541d2d327bf8b0629a (diff) | |
| download | systemd-cd6e3914f7e30f59e8712fa6c32b72523aa7458b.tar.gz systemd-cd6e3914f7e30f59e8712fa6c32b72523aa7458b.tar.bz2 systemd-cd6e3914f7e30f59e8712fa6c32b72523aa7458b.zip | |
nspawn: don't look for .nspawn file above the top-level directory, it makes no sense
Diffstat (limited to 'src/nspawn')
| -rw-r--r-- | src/nspawn/nspawn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 2542888c1e..de748b9de3 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(); |