X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fmachinectl.xml;h=6e991ee957f10425db1aec5120aa9c4fde055d21;hb=f4889f656b477887b02caa5e9d27387309c75a87;hp=37fefeadc8123f55aae1221a63a00297e7d6058b;hpb=f7f74d8ec46532f13a1dc418d550eaf76b339fa3;p=elogind.git
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 37fefeadc..6e991ee95 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -86,6 +86,42 @@
string and exits.
+
+
+
+ Do not pipe output into a
+ pager.
+
+
+
+
+
+ Do not query the user
+ for authentication for privileged
+ operations.
+
+
+
+
+
+
+ Execute the 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.
+
+
+
+
+
+
+ Execute the operation on a
+ local container. Specify a container
+ name to connect to.
+
+
@@ -117,26 +153,11 @@
- 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.
-
-
@@ -156,7 +177,7 @@
When used with
- kill-machine choose
+ kill-machine, choose
which signal to send to selected
processes. Must be one of the
well-known signal specifiers, such as
@@ -167,26 +188,6 @@
SIGTERM.
-
-
-
-
- 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.
-
-
-
-
-
-
- Acquire privileges via
- PolicyKit before executing the
- operation.
- The following commands are understood:
@@ -201,7 +202,7 @@
- status [ID...]
+ statusID...Show terse runtime
status information about one or more
@@ -214,7 +215,7 @@
- show [ID...]
+ showID...Show properties of one
or more registered virtual machines or
@@ -238,7 +239,7 @@
- terminate [ID...]
+ terminateID...Terminates a virtual
machine or container. This kills all
@@ -249,7 +250,7 @@
- kill [ID...]
+ killID...Send a signal to one
or more processes of the virtual
@@ -262,6 +263,19 @@
to select
the signal to send.
+
+
+ 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.
+
@@ -293,8 +307,8 @@
See Alsosystemd-machined.service8,
- systemd-logind.service8,
- systemd.special7.
+ systemd-nspawn1,
+ systemd.special7