diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-09-15 11:47:46 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-09-15 11:47:46 +0200 |
| commit | fa69a4c74b0109f5d0ad803f9e4334180a380fb4 (patch) | |
| tree | db2ba89551896d84e42c01a13c85b1f3025598cd /man/machinectl.xml | |
| parent | 1c12694439ac3227819f5801e1fcc9f6667c820c (diff) | |
| download | systemd-fa69a4c74b0109f5d0ad803f9e4334180a380fb4.tar.gz | |
man: update the description of machinectl -M
Fixes #6621.
Also rework the introduction a bit.
Diffstat (limited to 'man/machinectl.xml')
| -rw-r--r-- | man/machinectl.xml | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/man/machinectl.xml b/man/machinectl.xml index 46dcb44ca6..66ee0637c8 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -79,17 +79,18 @@ OS kernel with the host OS, in order to run OS userspace instances on top the host OS.</para></listitem> - <listitem><para>The host system itself</para></listitem> + <listitem><para>The host system itself.</para></listitem> </itemizedlist> <para>Machines are identified by names that follow the same rules - as UNIX and DNS host names, for details, see below. Machines are - instantiated from disk or file system images that frequently — but not - necessarily — carry the same name as machines running from - them. Images in this sense are considered:</para> + as UNIX and DNS host names. For details, see below.</para> + + <para>Machines are instantiated from disk or file system images that + frequently — but not necessarily — carry the same name as machines running + from them. Images in this sense may be:</para> <itemizedlist> - <listitem><para>Directory trees containing an OS, including its + <listitem><para>Directory trees containing an OS, including the top-level directories <filename>/usr</filename>, <filename>/etc</filename>, and so on.</para></listitem> @@ -299,7 +300,16 @@ </varlistentry> <xi:include href="user-system-options.xml" xpointer="host" /> - <xi:include href="user-system-options.xml" xpointer="machine" /> + + <varlistentry> + <term><option>-M</option></term> + <term><option>--machine=</option></term> + + <listitem><para>Connect to + <citerefentry><refentrytitle>systemd-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> + running in a local container, to perform the specified operation within + the container.</para></listitem> + </varlistentry> <xi:include href="standard-options.xml" xpointer="no-pager" /> <xi:include href="standard-options.xml" xpointer="no-legend" /> |