picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4975 from poettering/machinectl-shell-exit

Browse source 
man: document that "systemd-run -M" propagates exit codes, and "machi…
This commit is contained in:
Felipe Sateler 2016-12-27 18:19:45 -03:00 committed by GitHub
parent 27e2e3231f 7f129a1f7c
commit 6195285612
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
man/machinectl.xml
View file

@ -428,6 +428,9 @@
user may be selected. Use <option>--setenv=</option> to set
environment variables for the executed process.</para>
<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
@ -440,12 +443,15 @@
environment variables or resource limits, among other
properties.</para>
<para>Note that
<citerefentry><refentrytitle>systemd-run</refentrytitle><manvolnum>1</manvolnum></citerefentry>
may be used in place of the <command>shell</command> command,
and allows more detailed, low-level configuration of the
invoked unit. However, it is frequently more privileged than
the <command>shell</command> command.</para></listitem>
<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>
</varlistentry>
<varlistentry>

7
man/systemd-run.xml
View file

@ -221,7 +221,12 @@
<listitem><para>When invoking the command, the transient service connects its standard input and output to the
terminal <command>systemd-run</command> is invoked on, via a pseudo TTY device. This allows running binaries
that expect interactive user input as services, such as interactive command shells.</para></listitem>
that expect interactive user input as services, such as interactive command shells.</para>
<para>Note that
<citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
<command>shell</command> command is usually a better alternative for requesting a new, interactive login
session on the local host or a local container.</para></listitem>
</varlistentry>
<varlistentry>