summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-05-06 21:04:31 +0200
committerLennart Poettering <lennart@poettering.net>2013-05-06 21:06:18 +0200
commitf8964235e69f58225dec378437b1789744cd22a9 (patch)
tree17666e9cdc94e214ff5d14f85959db3df9c05639
parent07125a9240088f7859b18908cc7d07e396947e24 (diff)
nspawn: explain that we look for /etc/os-release in the container directory
https://bugs.freedesktop.org/show_bug.cgi?id=64014
-rw-r--r--man/systemd-nspawn.xml9
-rw-r--r--src/nspawn/nspawn.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index e7c859d11d..cab5990a56 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -133,6 +133,15 @@
<ulink
url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container
Interface</ulink> specification.</para>
+
+ <para>As a safety check
+ <command>systemd-nspawn</command> will verify the
+ existance of <filename>/etc/os-release</filename> in
+ the container tree before starting the container (see
+ <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>). It
+ might be necessary to add this file to the container
+ tree manually if the OS of the container is too old to
+ contain this file out-of-the-box.</para>
</refsect1>
<refsect1>
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index e907a1daa7..f3568ab40c 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1285,7 +1285,7 @@ int main(int argc, char *argv[]) {
}
if (path_is_os_tree(arg_directory) <= 0) {
- log_error("Directory %s doesn't look like an OS root directory. Refusing.", arg_directory);
+ log_error("Directory %s doesn't look like an OS root directory (/etc/os-release is missing). Refusing.", arg_directory);
goto finish;
}