X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fmachinectl.xml;h=baa0e17e3679bad93c0a3d2310214f80286488cc;hb=8b0cc9a36c8f92f010f2e8465942d2cd7c580d78;hp=9d8a94aab4335fac91803631c2d402a371288bc1;hpb=785890acf6d629ff881a1f065f431df1b7fc8c7a;p=elogind.git
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 9d8a94aab..baa0e17e3 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -165,6 +165,34 @@
mount.
+
+
+
+
+
+ When used with
+ status, controls
+ the number of journal lines to show,
+ counting from the most recent
+ ones. Takes a positive integer
+ argument. Defaults to 10.
+
+
+
+
+
+
+
+ When used with
+ status, controls
+ the formatting of the journal entries
+ that are shown. For the available
+ choices, see
+ journalctl1.
+ Defaults to
+ short.
+
+
@@ -185,27 +213,34 @@
- statusID...
+ statusNAME...Show terse runtime
status information about one or more
- virtual machines and containers. This
- function is intended to generate
- human-readable output. If you are
- looking for computer-parsable output,
- use show instead.
-
+ virtual machines and containers,
+ followed by the most recent log data
+ from the journal. This function is
+ intended to generate human-readable
+ output. If you are looking for
+ computer-parsable output, use
+ show instead. Note
+ that the log data shown is reported by
+ the virtual machine or container
+ manager, and frequently contains
+ console output of the machine, but not
+ necessarily journal contents of the
+ machine itself.
- showID...
+ showNAME...Show properties of one
or more registered virtual machines or
containers or the manager itself. If
no argument is specified, properties
of the manager will be shown. If an
- ID is specified, properties of this
+ NAME is specified, properties of this
virtual machine or container are
shown. By default, empty properties
are suppressed. Use
@@ -222,7 +257,7 @@
- loginID
+ loginNAMEOpen a terminal login
session to a container. This will
@@ -235,7 +270,7 @@
- rebootID...
+ rebootNAME...Reboot one or more
containers. This will trigger a reboot
@@ -248,7 +283,7 @@
- poweroffID...
+ poweroffNAME...Power off one or more
containers. This will trigger a reboot
@@ -264,7 +299,7 @@
- killID...
+ killNAME...Send a signal to one
or more processes of the virtual
@@ -279,7 +314,7 @@
- terminateID...
+ terminateNAME...Terminates a virtual
machine or container. This kills all
@@ -290,7 +325,7 @@
- bindIDDIRECTORY [DIRECTORY]
+ bindNAMEPATH [PATH]Bind mounts a
directory from the host into the
@@ -314,6 +349,33 @@
containers.
+
+ copy-toNAMEPATH [PATH]
+
+ Copies files or
+ directories from the host system into
+ a running container. Takes a container
+ name, followed by the source path on
+ the host and the destination path in
+ the container. If the destination path
+ is omitted the same as the source path
+ is used.
+
+
+
+
+ copy-fromNAMEPATH [PATH]
+
+ Copies files or
+ directories from a container into the
+ host system. Takes a container name,
+ followed by the source path in the
+ container the destination path on the
+ host. If the destination path is
+ omitted the same as the source path is
+ used.
+
+