diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-08-05 15:11:27 +0300 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-08-05 15:11:27 +0300 |
| commit | 652f0e397fab33e325f4119dceece9f334f549cf (patch) | |
| tree | 4339ee1bc78fe58bf094dd7ebd7cb08733cece8c | |
| parent | 94029f6c3e3443f68236412b70bed0ef89ba310e (diff) | |
| parent | 32b64cce23cd7fb35900a0613a1162e639f0c59c (diff) | |
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)
| -rw-r--r-- | man/systemd-nspawn.xml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 06285edc0b..d1e050cb89 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -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> |