X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fmachinectl.xml;h=f6729151ba9ab854bd7472b048f0f336f72e7609;hp=55bb694e6c6bfbeb964aea2fa619632be72f65e5;hb=3ba3a79df4ae094d1008c04a9af8d1ff970124c4;hpb=7de304525deafe4eb86060321e39787138dbbadf
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 55bb694e6..f6729151b 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -214,6 +214,18 @@
URL.
+
+
+
+ When used with the
+ or commands specifies the
+ compression format to use for the resulting file. Takes one of
+ uncompressed, xz,
+ gzip, bzip2. By default
+ the format is determined automatically from the image file
+ name passed.
+
+
@@ -669,19 +681,78 @@
below.
+
+ import-tarFILE [NAME]
+ import-rawFILE [NAME]
+ Imports a TAR or RAW container or VM image,
+ and places it under the specified name in
+ /var/lib/machines/. When
+ import-tar is used the file specified as
+ first argument should be a tar archive, possibly compressed
+ with xz, gzip or bzip2. It will then be unpacked into its own
+ subvolume in /var/lib/machines. When
+ import-raw is used the file should be a
+ qcow2 or raw disk image, possibly compressed with xz, gzip or
+ bzip2. If the second argument (the resulting image name) is
+ not specified it is automatically derived from the file
+ name. If the file name is passed as - the
+ image is read from standard input, in which case the second
+ argument is mandatory.
+
+ Similar as with pull-tar,
+ pull-raw the file system
+ /var/lib/machines.raw is increased in
+ size of necessary and appropriate. Optionally the
+ switch may be used to create a
+ read-only container or VM image. No cryptographic validation
+ is done when importing the images.
+
+ Much like image downloads, ongoing imports may be listed
+ with list-transfers and aborted with
+ cancel-transfer.
+
+
+
+ export-tarNAME [FILE]
+ export-rawNAME [FILE]
+ Exports a TAR or RAW container or VM image and
+ stores it in the specified file. The first parameter should be
+ a VM or container image name. The second parameter should be a
+ file path the TAR or RAW image is written to. If the path ends
+ in .gz the file is compressed with gzip, if
+ it ends in .xz with xz, and if it ends in
+ .bz2 with bzip2. If the path ends in
+ neither the file is left uncompressed. If the second argument
+ is missing the image is written to standard output. The
+ compression may also be explicitly selected with the
+ switch. This is in particular
+ useful if the second parameter is left unspecified.
+
+ Much like image downloads and imports, ongoing exports
+ may be listed with list-transfers and
+ aborted with
+ cancel-transfer.
+
+ Note that currently only directory and subvolume images
+ may be exported as TAR images, and only raw disk images as RAW
+ images.
+
+
list-transfersShows a list of container or VM image
- downloads that are currently in progress.
+ downloads, imports and exports that are currently in
+ progress.
cancel-transfersID...
- Aborts download of the container or VM image
- with the specified ID. To list ongoing transfers and their
- IDs, use list-transfers.
+ Aborts a download, import or export of the
+ container or VM image with the specified ID. To list ongoing
+ transfers and their IDs, use
+ list-transfers.
@@ -705,13 +776,15 @@
Note that many image operations are only supported,
efficient or atomic on btrfs file systems. Due to this, if the
pull-tar, pull-raw,
- pull-dkr and set-limit
+ pull-dkr, import-tar,
+ import-raw and set-limit
commands notice that /var/lib/machines is
empty and not located on btrfs, they will implicitly set up a
loopback file /var/lib/machines.raw
containing a btrfs file system that is mounted to
/var/lib/machines. The size of this loopback
- file may be controlled dynamically with set-limit.
+ file may be controlled dynamically with
+ set-limit.
Disk images are understood by
systemd-nspawn1
@@ -782,6 +855,17 @@
index server to be specified with the
--dkr-index-url=.
+
+
+ Exports a container image as tar file
+
+ # machinectl export-tar fedora myfedora.tar.xz
+
+ Exports the container fedora in an
+ xz-compress tar file myfedora.tar.xz in the
+ current directory.
+
+
@@ -798,7 +882,11 @@
systemd-machined.service8,
systemd-nspawn1,
- systemd.special7
+ systemd.special7,
+ tar1,
+ xz1,
+ gzip1,
+ bzip21