diff options
| author | Lennart Poettering <lennart@poettering.net> | 2023-11-16 11:31:02 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2024-01-03 18:38:46 +0100 |
| commit | 7d93e4af8088fae7b50eb638c6e297fb8371e307 (patch) | |
| tree | 2570f7f77ba31ed8c0f9dd5acd92bb9a608e529e /man/systemd-nspawn.xml | |
| parent | discover-image: add support for vpick (diff) | |
| download | systemd-7d93e4af8088fae7b50eb638c6e297fb8371e307.tar.xz systemd-7d93e4af8088fae7b50eb638c6e297fb8371e307.zip | |
man: document the new vpick concept
Diffstat (limited to 'man/systemd-nspawn.xml')
| -rw-r--r-- | man/systemd-nspawn.xml | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index e721f0e5ab..1a9fb09aae 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -209,21 +209,21 @@ <term><option>-D</option></term> <term><option>--directory=</option></term> - <listitem><para>Directory to use as file system root for the - container.</para> + <listitem><para>Directory to use as file system root for the container.</para> - <para>If neither <option>--directory=</option>, nor - <option>--image=</option> is specified the directory is - determined by searching for a directory named the same as the - machine name specified with <option>--machine=</option>. See + <para>If neither <option>--directory=</option>, nor <option>--image=</option> is specified the + directory is 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> + <para>In place of the directory path a <literal>.v/</literal> versioned directory may be specified, see + <citerefentry><refentrytitle>systemd.v</refentrytitle><manvolnum>7</manvolnum></citerefentry> for + details.</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> <varlistentry> @@ -317,6 +317,10 @@ <para>Any other partitions, such as foreign partitions or swap partitions are not mounted. May not be specified together with <option>--directory=</option>, <option>--template=</option>.</para> + <para>In place of the image path a <literal>.v/</literal> versioned directory may be specified, see + <citerefentry><refentrytitle>systemd.v</refentrytitle><manvolnum>7</manvolnum></citerefentry> for + details.</para> + <xi:include href="version-info.xml" xpointer="v211"/></listitem> </varlistentry> |