diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-01-15 01:40:02 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-01-15 01:47:21 +0100 |
| commit | 5f129649b97bdff2bffefcd9c773157843ede6f6 (patch) | |
| tree | 363ba7c2543994871cc86090ff3a588583309ee8 /man/systemd-nspawn.xml | |
| parent | aceac2f0b652dff701e5815c51c2e372e8fee84d (diff) | |
nspawn,machined: change default container image location from /var/lib/container to /var/lib/machines
Given that this is also the place to store raw disk images which are
very much bootable with qemu/kvm it sounds like a misnomer to call the
directory "container". Hence, let's change this sooner rather than
later, and use the generic name, in particular since we otherwise try to
use the generic "machine" preferably over the more specific "container"
or "vm".
Diffstat (limited to 'man/systemd-nspawn.xml')
| -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 e67aeecb1a..0c6fb00289 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -171,7 +171,7 @@ <option>--directory=</option>, nor <option>--image=</option> is specified the directory is determined as - <filename>/var/lib/container/</filename> + <filename>/var/lib/machines/</filename> suffixed by the machine name as specified with <option>--machine=</option>. If @@ -247,10 +247,13 @@ the root directory for the container from. Takes a path to a regular file or to a block device node. The file or - block device must contain a GUID - Partition Table with a root partition - which is mounted as the root directory - of the container. Optionally, it may + block device must contain either an + MBR partition table with a single + partition of type 0x83 that is marked + bootable, or a GUID partition table + with a root partition which is mounted + as the root directory of the + container. Optionally, GPT images may contain a home and/or a server data partition which are mounted to the appropriate places in the @@ -842,7 +845,7 @@ <example> <title>Enable Arch Linux container on boot</title> - <programlisting># mv ~/arch-tree /var/lib/container/arch + <programlisting># mv ~/arch-tree /var/lib/machines/arch # systemctl enable systemd-nspawn@arch.service # systemctl start systemd-nspawn@arch.service</programlisting> |