diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-10-30 15:34:50 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-10-30 15:37:02 +0100 |
| commit | a7893c6b28772edbc7e1fea3c209caa54d465648 (patch) | |
| tree | ae9e44874c63592f44321b9fc9ed07b2c808ef58 /man | |
| parent | 0f8bd8debb0ff7f5bff7738841931f6c41e40bc1 (diff) | |
bus: add API call to create bus connection to the system bus of local containers
Also, add support for this to machinectl, so that we can enumerate the
machines that run inside a container. We must go deeper!
Diffstat (limited to 'man')
| -rw-r--r-- | man/machinectl.xml | 75 |
1 files changed, 38 insertions, 37 deletions
diff --git a/man/machinectl.xml b/man/machinectl.xml index 2ed9f2e8a1..f2fa6ce53e 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -87,6 +87,42 @@ </varlistentry> <varlistentry> + <term><option>--no-pager</option></term> + + <listitem><para>Do not pipe output into a + pager.</para></listitem> + </varlistentry> + + <varlistentry> + <term><option>--no-ask-password</option></term> + + <listitem><para>Do not query the user + for authentication for privileged + operations.</para></listitem> + </varlistentry> + + <varlistentry> + <term><option>-H</option></term> + <term><option>--host=</option></term> + + <listitem><para>Execute operation + remotely. Specify a hostname, or + username and hostname separated by <literal>@</literal>, + to connect to. This will use SSH to + talk to the remote machine manager + instance.</para></listitem> + </varlistentry> + + <varlistentry> + <term><option>-M</option></term> + <term><option>--machine=</option></term> + + <listitem><para>Execute operation on a + local container. Specify a container + name to connect to.</para></listitem> + </varlistentry> + + <varlistentry> <term><option>-p</option></term> <term><option>--property=</option></term> @@ -123,21 +159,6 @@ </varlistentry> <varlistentry> - <term><option>--no-pager</option></term> - - <listitem><para>Do not pipe output into a - pager.</para></listitem> - </varlistentry> - - <varlistentry> - <term><option>--no-ask-password</option></term> - - <listitem><para>Do not query the user - for authentication for privileged - operations.</para></listitem> - </varlistentry> - - <varlistentry> <term><option>--kill-who=</option></term> <listitem><para>When used with @@ -167,26 +188,6 @@ <constant>SIGTERM</constant>.</para></listitem> </varlistentry> - <varlistentry> - <term><option>-H</option></term> - <term><option>--host</option></term> - - <listitem><para>Execute operation - remotely. Specify a hostname, or - username and hostname separated by <literal>@</literal>, - to connect to. This will use SSH to - talk to the remote machine manager - instance.</para></listitem> - </varlistentry> - - <varlistentry> - <term><option>-P</option></term> - <term><option>--privileged</option></term> - - <listitem><para>Acquire privileges via - PolicyKit before executing the - operation.</para></listitem> - </varlistentry> </variablelist> <para>The following commands are understood:</para> @@ -293,8 +294,8 @@ <title>See Also</title> <para> <citerefentry><refentrytitle>systemd-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, - <citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, - <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>. + <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry> </para> </refsect1> |