diff options
Diffstat (limited to 'man/machinectl.xml')
| -rw-r--r-- | man/machinectl.xml | 65 |
1 files changed, 29 insertions, 36 deletions
diff --git a/man/machinectl.xml b/man/machinectl.xml index 5bc82e5d1a..1b39e42e38 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -192,7 +192,7 @@ the machine name is specified as the empty string, or the special machine name <literal>.host</literal> (see below) is specified, the connection is made to the local host - instead. This works similar to <command>login</command> but + instead. This works similarly to <command>login</command>, but immediately invokes a user process. This command runs the specified executable with the specified arguments, or the default shell for the user if none is specified, or @@ -205,40 +205,35 @@ <para>Note that <command>machinectl shell</command> does not propagate the exit code/status of the invoked shell process. Use <command>systemd-run</command> instead if that information is required (see below).</para> - <para>When using the <command>shell</command> command without - arguments, (thus invoking the executed shell or command on the - local host), it is in many ways similar to a <citerefentry - project='die-net'><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry> - session, but, unlike <command>su</command>, completely isolates - the new session from the originating session, so that it - shares no process or session properties, and is in a clean and - well-defined state. It will be tracked in a new utmp, login, - audit, security and keyring session, and will not inherit any - environment variables or resource limits, among other - properties.</para> - - <para>Note that <citerefentry><refentrytitle>systemd-run</refentrytitle><manvolnum>1</manvolnum></citerefentry> - with its <option>--machine=</option> switch may be used in place of the <command>machinectl shell</command> - command, and allows non-interactive operation, more detailed and low-level configuration of the invoked unit, - as well as access to runtime and exit code/status information of the invoked shell process. In particular, use - <command>systemd-run</command>'s <option>--wait</option> switch to propagate exit status information of the - invoked process. Use <command>systemd-run</command>'s <option>--pty</option> switch for acquiring an - interactive shell, similar to <command>machinectl shell</command>. In general, <command>systemd-run</command> - is preferable for scripting purposes. However, note that <command>systemd-run</command> might require higher - privileges than <command>machinectl shell</command>.</para></listitem> + <para>Using the <command>shell</command> command without arguments (thus invoking the executed shell + or command on the local host), is in many ways similar to a <citerefentry + project='die-net'><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></citerefentry> session, + but, unlike <command>su</command>, completely isolates the new session from the originating session, + so that it shares no process or session properties and is in a clean well-defined state. It will be + tracked in a new utmp, login, audit, security, and keyring sessions, and will not inherit any + environment variables or resource limits, among other properties.</para> + + <para>Note that + <citerefentry><refentrytitle>systemd-run</refentrytitle><manvolnum>1</manvolnum></citerefentry> with + its <option>--machine=</option> switch may be used in place of the <command>machinectl + shell</command> command, and allows non-interactive operation, more detailed and low-level + configuration of the invoked unit, as well as access to runtime and exit code/status information of + the invoked shell process. In particular, use <command>systemd-run</command>'s + <option>--wait</option> switch to propagate exit status information of the invoked process. Use + <command>systemd-run</command>'s <option>--pty</option> switch to acquire an interactive shell, + similarly to <command>machinectl shell</command>. In general, <command>systemd-run</command> is + preferable for scripting purposes. However, note that <command>systemd-run</command> might require + higher privileges than <command>machinectl shell</command>.</para></listitem> </varlistentry> <varlistentry> <term><command>enable</command> <replaceable>NAME</replaceable>…</term> <term><command>disable</command> <replaceable>NAME</replaceable>…</term> - <listitem><para>Enable or disable a container as a system - service to start at system boot, using + <listitem><para>Enable or disable a container as a system service to start at system boot, using <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>. - This enables or disables - <filename>systemd-nspawn@.service</filename>, instantiated for - the specified machine name, similar to the effect of - <command>systemctl enable</command> or <command>systemctl + This enables or disables <filename>systemd-nspawn@.service</filename>, instantiated for the specified + machine name, similarly to the effect of <command>systemctl enable</command> or <command>systemctl disable</command> on the service name.</para></listitem> </varlistentry> @@ -544,11 +539,9 @@ machine name. To omit creation of the local, writable copy pass <literal>-</literal> as local machine name.</para> - <para>Similar to the behavior of <command>pull-tar</command>, - the read-only image is prefixed with - <filename>.raw-</filename>, and thus not shown by - <command>list-images</command>, unless <option>--all</option> - is passed.</para> + <para>Similarly to the behavior of <command>pull-tar</command>, the read-only image is prefixed with + <filename>.raw-</filename>, and thus not shown by <command>list-images</command>, unless + <option>--all</option> is passed.</para> <para>Note that pressing C-c during execution of this command will not abort the download. Use @@ -586,9 +579,9 @@ <term><command>import-fs</command> <replaceable>DIRECTORY</replaceable> [<replaceable>NAME</replaceable>]</term> <listitem><para>Imports a container image stored in a local directory into - <filename>/var/lib/machines/</filename>, operates similar to <command>import-tar</command> or - <command>import-raw</command>, but the first argument is the source directory. If supported, this command will - create btrfs snapshot or subvolume for the new image.</para></listitem> + <filename>/var/lib/machines/</filename>, operates similarly to <command>import-tar</command> or + <command>import-raw</command>, but the first argument is the source directory. If supported, this + command will create a btrfs snapshot or subvolume for the new image.</para></listitem> </varlistentry> <varlistentry> |