summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Batts <vbatts@redhat.com>2014-02-10 11:57:53 +0100
committerTom Gundersen <teg@jklm.no>2014-02-10 11:57:53 +0100
commitfcf90586a2b26c445d6a35313990096c8562ecee (patch)
treea12f029433ef40fe125c58226a0bcf0a681d2b5f
parentd50cf59b94e44d359c3f947a990b730a1f1a242c (diff)
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.
-rw-r--r--src/nspawn/nspawn.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 46ca3357b4..be8161c351 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;
}