Merge pull request #874 from richardmaw-codethink/doc-nspawn-machine-search-path-v2

man: Reference the canonical location of the search path in systemd-nspawn's documentation of the --machine option. (v2)
This commit is contained in:
Lennart Poettering
2015-08-05 15:11:27 +03:00

View File

@@ -156,12 +156,15 @@
<para>If neither <option>--directory=</option>, nor
<option>--image=</option> is specified the directory is
determined as <filename>/var/lib/machines/</filename> suffixed
by the machine name as specified with
<option>--machine=</option>. If neither
<option>--directory=</option>, <option>--image=</option>, nor
<option>--machine=</option> are specified, the current
directory will be used. May not be specified together with
determined by searching for a directory named the same as the
machine name specified with <option>--machine=</option>. See
<citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
section "Files and Directories" for the precise search path.</para>
<para>If neither <option>--directory=</option>,
<option>--image=</option>, nor <option>--machine=</option>
are specified, the current directory will
be used. May not be specified together with
<option>--image=</option>.</para></listitem>
</varlistentry>