X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fmachinectl.xml;fp=man%2Fmachinectl.xml;h=19531866c7d0ddbe37977e5f532036df89443d87;hp=91bdb5e111505b068d0dd34acf3c92e773fae908;hb=5f129649b97bdff2bffefcd9c773157843ede6f6;hpb=aceac2f0b652dff701e5815c51c2e372e8fee84d
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 91bdb5e11..19531866c 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -291,10 +291,10 @@
name. systemd-nspawn
looks for a container image by the
specified name in
- /var/lib/container
- and runs it. Use
- list-images (see
- below), for listing available
+ /var/lib/machines/
+ (and other search paths, see below) and runs
+ it. Use list-images
+ (see below), for listing available
container images to start.
Note that
@@ -488,7 +488,7 @@
images. This enumerates all raw disk
images and container directories and
subvolumes in
- /var/lib/container/. Use
+ /var/lib/machines/ (and other search paths, see below). Use
start (see above)
to run a container off one of the
listed images. Note that by default
@@ -595,6 +595,51 @@
+
+ Files and Directories
+
+ Machine images are preferably stored in
+ /var/lib/machines/, but are also
+ searched for in
+ /usr/local/lib/machines/ and
+ /usr/lib/machines/. For
+ compatibility reasons the directory
+ /var/lib/container/ is searched,
+ too. Note that images stored below
+ /usr are always considered
+ read-only. It is possible to symlink machines images
+ from other directories into
+ /var/lib/machines/ to make them
+ available for control with
+ machinectl.
+
+ Disk images are understood in three formats:
+
+
+ A simple directory tree,
+ containing the files and directories of the
+ container to boot.
+
+ 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.
+
+ "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
+ .raw.
+
+
+ See
+ systemd-nspawn1
+ for more information on image formats, in particular
+ it's and
+ options.
+
+
Exit status