X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fmachinectl.xml;h=6e991ee957f10425db1aec5120aa9c4fde055d21;hb=d450b6f2a9dd8a7fb14e9f8f771ddd70de7afc5e;hp=2606180d123d70890d217502e5099d6f4777b547;hpb=19887cd06a3af2f045e763986eda19e208bd3f85;p=elogind.git
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 2606180d1..6e991ee95 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -86,14 +86,50 @@
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.
+
+
When showing
- session/user properties, limit
- display to certain properties as
- specified as argument. If not
+ machine properties, limit the
+ output to certain properties as
+ specified by the argument. If not
specified, all set properties are
shown. The argument should be a
property name, such as
@@ -108,8 +144,8 @@
When showing
- unit/job/manager properties, show all
- properties regardless whether they are
+ machine properties, show all
+ properties regardless of whether they are
set or not.
@@ -117,37 +153,22 @@
- 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-session,
+ kill-machine,
choose which processes to kill. Must
be one of , or
to select whether
to kill only the leader process of the
- session or all processes of the
- session. If omitted, defaults to
+ machine or all processes of the
+ machine. If omitted, defaults to
.
@@ -156,11 +177,10 @@
When used with
- kill-session or
- kill-user, choose
+ kill-machine, choose
which signal to send to selected
- processes. Must be one of the well
- known signal specifiers, such as
+ processes. Must be one of the
+ well-known signal specifiers, such as
SIGTERM,
SIGINT or
SIGSTOP. If
@@ -168,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:
@@ -202,7 +202,7 @@
- status [ID...]
+ statusID...Show terse runtime
status information about one or more
@@ -215,13 +215,13 @@
- show [ID...]
+ showID...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 a an
+ of the manager will be shown. If an
ID is specified, properties of this
virtual machine or container are
shown. By default, empty properties
@@ -239,7 +239,7 @@
- terminate [ID...]
+ terminateID...Terminates a virtual
machine or container. This kills all
@@ -250,7 +250,7 @@
- kill [ID...]
+ killID...Send a signal to one
or more processes of the virtual
@@ -263,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.
+
@@ -294,7 +307,8 @@
See Alsosystemd-machined.service8,
- systemd-logind.service8
+ systemd-nspawn1,
+ systemd.special7