From: Vincent Batts <vbatts@redhat.com>
Date: Mon, 10 Feb 2014 10:57:53 +0000 (+0100)
Subject: nspawn: require /etc/os-release only for init
X-Git-Tag: v209~208
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=fcf90586a2b26c445d6a35313990096c8562ecee

nspawn: require /etc/os-release only for init

/etc/os-release is expected for the case for booting a full system, and
need not be required for thin container execution.
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 46ca3357b..be8161c35 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1200,7 +1200,7 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        if (path_is_os_tree(arg_directory) <= 0) {
+        if (arg_boot && path_is_os_tree(arg_directory) <= 0) {
                 log_error("Directory %s doesn't look like an OS root directory (/etc/os-release is missing). Refusing.", arg_directory);
                 goto finish;
         }