summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-01-15 01:40:02 +0100
committerLennart Poettering <lennart@poettering.net>2015-01-15 01:47:21 +0100
commit5f129649b97bdff2bffefcd9c773157843ede6f6 (patch)
tree363ba7c2543994871cc86090ff3a588583309ee8 /man
parentaceac2f0b652dff701e5815c51c2e372e8fee84d (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')
-rw-r--r--man/machinectl.xml55
-rw-r--r--man/systemd-nspawn.xml15
2 files changed, 59 insertions, 11 deletions
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 91bdb5e111..19531866c7 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -291,10 +291,10 @@
name. <command>systemd-nspawn</command>
looks for a container image by the
specified name in
- <filename>/var/lib/container</filename>
- and runs it. Use
- <command>list-images</command> (see
- below), for listing available
+ <filename>/var/lib/machines/</filename>
+ (and other search paths, see below) and runs
+ it. Use <command>list-images</command>
+ (see below), for listing available
container images to start.</para>
<para>Note that
@@ -488,7 +488,7 @@
images. This enumerates all raw disk
images and container directories and
subvolumes in
- <filename>/var/lib/container/</filename>. Use
+ <filename>/var/lib/machines/</filename> (and other search paths, see below). Use
<command>start</command> (see above)
to run a container off one of the
listed images. Note that by default
@@ -596,6 +596,51 @@
</refsect1>
<refsect1>
+ <title>Files and Directories</title>
+
+ <para>Machine images are preferably stored in
+ <filename>/var/lib/machines/</filename>, but are also
+ searched for in
+ <filename>/usr/local/lib/machines/</filename> and
+ <filename>/usr/lib/machines/</filename>. For
+ compatibility reasons the directory
+ <filename>/var/lib/container/</filename> is searched,
+ too. Note that images stored below
+ <filename>/usr</filename> are always considered
+ read-only. It is possible to symlink machines images
+ from other directories into
+ <filename>/var/lib/machines/</filename> to make them
+ available for control with
+ <command>machinectl</command>.</para>
+
+ <para>Disk images are understood in three formats:</para>
+
+ <itemizedlist>
+ <listitem><para>A simple directory tree,
+ containing the files and directories of the
+ container to boot.</para></listitem>
+
+ <listitem><para>A subvolume (on btrfs file
+ systems), which are similar to the simple
+ directories, described above. However, they
+ have additional benefits, such as efficient
+ cloning and quota reporting.</para></listitem>
+
+ <listitem><para>"Raw" disk images, i.e. binary
+ images of disks with a GPT or MBR partition
+ table. Images of this type are regular
+ files with the suffix
+ <literal>.raw</literal>.</para></listitem>
+ </itemizedlist>
+
+ <para>See
+ <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+ for more information on image formats, in particular
+ it's <option>--directory=</option> and
+ <option>--image=</option> options.</para>
+ </refsect1>
+
+ <refsect1>
<title>Exit status</title>
<para>On success, 0 is returned, a non-zero failure
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>