diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-11-18 18:38:06 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-11-22 13:35:09 +0100 |
| commit | 0f3be6ca4dbbac8350cd8f10a8968d31f7bc13b6 (patch) | |
| tree | 0d261da3442bf68af3818ad31dc0e57d86482fc4 /man | |
| parent | 1a1b13c9573b8cd30a4ab8dca2ec7961e460f083 (diff) | |
nspawn: support ephemeral boots from images
Previously --ephemeral was only supported with container trees in btrfs
subvolumes (i.e. in combination with --directory=). This adds support for
--ephemeral in conjunction with disk images (i.e. --image=) too.
As side effect this fixes that --ephemeral was accepted but ignored when using
-M on a container that turned out to be an image.
Fixes: #4664
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-nspawn.xml | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index f153034296..c29542236d 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -211,13 +211,8 @@ <term><option>-x</option></term> <term><option>--ephemeral</option></term> - <listitem><para>If specified, the container is run with a - temporary <literal>btrfs</literal> snapshot of its root - directory (as configured with <option>--directory=</option>), - that is removed immediately when the container terminates. - This option is only supported if the root file system is - <literal>btrfs</literal>. May not be specified together with - <option>--image=</option> or + <listitem><para>If specified, the container is run with a temporary snapshot of its file system that is removed + immediately when the container terminates. May not be specified together with <option>--template=</option>.</para> <para>Note that this switch leaves host name, machine ID and all other settings that could identify the instance @@ -252,11 +247,12 @@ Partitions Specification</ulink>.</para></listitem> </itemizedlist> - <para>Any other partitions, such as foreign partitions, swap - partitions or EFI system partitions are not mounted. May not - be specified together with <option>--directory=</option>, - <option>--template=</option> or - <option>--ephemeral</option>.</para></listitem> + <para>On GPT images, if an EFI System Partition (ESP) is discovered, it is automatically mounted to + <filename>/efi</filename> (or <filename>/boot</filename> as fallback) in case a directory by this name exists + and is empty.</para> + + <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></listitem> </varlistentry> <varlistentry> |