chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d50cf59
)
nspawn: require /etc/os-release only for init
author
Vincent Batts
<vbatts@redhat.com>
Mon, 10 Feb 2014 10:57:53 +0000
(11:57 +0100)
committer
Tom Gundersen
<teg@jklm.no>
Mon, 10 Feb 2014 10:57:53 +0000
(11:57 +0100)
/etc/os-release is expected for the case for booting a full system, and
need not be required for thin container execution.
src/nspawn/nspawn.c
patch
|
blob
|
history
diff --git
a/src/nspawn/nspawn.c
b/src/nspawn/nspawn.c
index 46ca3357b4706d637da3a116570aae8a6252b88f..be8161c351917c5cb3a38defea971e4d13fd4858 100644
(file)
--- 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;
}