X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fmachinectl.xml;h=89dca9cf89f45b32c94ed58f078a80876cf3450c;hb=2d0efdf1af5ff77441228854343c61d42a89840c;hp=37fefeadc8123f55aae1221a63a00297e7d6058b;hpb=f7f74d8ec46532f13a1dc418d550eaf76b339fa3;p=elogind.git
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 37fefeadc..89dca9cf8 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -21,7 +21,8 @@
along with systemd; If not, see .
-->
-
+machinectl
@@ -71,21 +72,6 @@
The following options are understood:
-
-
-
-
- Prints a short help
- text and exits.
-
-
-
-
-
- Prints a short version
- string and exits.
-
-
@@ -117,31 +103,16 @@
- Do not ellipsize cgroup
- members.
+ Do not ellipsize
+ process tree entries.
-
-
-
- Do not pipe output into a
- pager.
-
-
-
-
-
- Do not query the user
- for authentication for privileged
- operations.
-
-
When used with
- kill-machine,
+ kill,
choose which processes to kill. Must
be one of , or
to select whether
@@ -156,7 +127,7 @@
When used with
- kill-machine choose
+ kill, choose
which signal to send to selected
processes. Must be one of the
well-known signal specifiers, such as
@@ -168,25 +139,19 @@
-
-
-
- Execute operation
- remotely. Specify a hostname, or
- username and hostname separated by @,
- to connect to. This will use SSH to
- talk to the remote machine manager
- instance.
+
+
+ Do not print the legend,
+ i.e. the column headers and the
+ footer.
-
-
-
+
+
- Acquire privileges via
- PolicyKit before executing the
- operation.
-
+
+
+ The following commands are understood:
@@ -201,7 +166,7 @@
- status [ID...]
+ statusID...Show terse runtime
status information about one or more
@@ -214,7 +179,7 @@
- show [ID...]
+ showID...Show properties of one
or more registered virtual machines or
@@ -238,7 +203,7 @@
- terminate [ID...]
+ terminateID...Terminates a virtual
machine or container. This kills all
@@ -249,7 +214,7 @@
- kill [ID...]
+ killID...Send a signal to one
or more processes of the virtual
@@ -262,6 +227,31 @@
to select
the signal to send.
+
+
+ rebootID...
+
+ Reboot one or more
+ containers. This will trigger a reboot
+ by sending SIGINT to the container's
+ init process, which is roughly
+ equivalent to pressing Ctrl+Alt+Del on
+ a non-containerized
+ system.
+
+
+
+ loginID
+
+ Open a terminal login
+ session to a container. This will
+ create a TTY connection to a specific
+ container and asks for the execution of a
+ getty on it. Note that this is only
+ supported for containers running
+ systemd1
+ as init system.
+
@@ -273,28 +263,14 @@
code otherwise.
-
- Environment
-
-
-
- $SYSTEMD_PAGER
- Pager to use when
- is not given;
- overrides $PAGER. Setting
- this to an empty string or the value
- cat is equivalent to passing
- .
-
-
-
+ See Alsosystemd-machined.service8,
- systemd-logind.service8,
- systemd.special7.
+ systemd-nspawn1,
+ systemd.special7