picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nspawn: explain that we look for /etc/os-release in the container directory

Browse source 
https://bugs.freedesktop.org/show_bug.cgi?id=64014
This commit is contained in:
Lennart Poettering 2013-05-06 21:04:31 +02:00
parent 07125a9240
commit f8964235e6
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
man/systemd-nspawn.xml
View file

@ -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>

2
src/nspawn/nspawn.c
View file

@ -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;
}