diff options
author | Alan Jenkins <alan.christopher.jenkins@gmail.com> | 2017-12-16 10:48:12 +0000 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-12-16 11:48:12 +0100 |
commit | 3f2d136505370bb2c8ccd6f66a33c559847b3ab4 (patch) | |
tree | 34b93787a8ae135229b00bd22fe36d222a84afa6 /man/systemd-nspawn.xml | |
parent | 6671e818e93ee1b3caf071d3aff284fb8fa85f00 (diff) | |
download | systemd-3f2d136505370bb2c8ccd6f66a33c559847b3ab4.tar.gz |
man: generalize "binary" to "program" (#7668)
Systemd services are permitted to be scripts, as well as binary
executables.
The same also applies to the underlying /sbin/mount and /sbin/swapon.
It is not necessary for the user to consider what type of program file
these are. Nor is it necessary with systemd-nspawn, to distinguish between
init as a "binary" v.s. a user-specified "program".
Also fix a couple of grammar nits in the modified sentences.
Diffstat (limited to 'man/systemd-nspawn.xml')
-rw-r--r-- | man/systemd-nspawn.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 3dbdf376d3..b3f8eb6518 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -149,7 +149,7 @@ <title>Options</title> <para>If option <option>-b</option> is specified, the arguments - are used as arguments for the init binary. Otherwise, + are used as arguments for the init program. Otherwise, <replaceable>COMMAND</replaceable> specifies the program to launch in the container, and the remaining arguments are used as arguments for this program. If <option>--boot</option> is not used and @@ -273,12 +273,12 @@ <term><option>--as-pid2</option></term> <listitem><para>Invoke the shell or specified program as process ID (PID) 2 instead of PID 1 (init). By - default, if neither this option nor <option>--boot</option> is used, the selected binary is run as process with - PID 1, a mode only suitable for programs that are aware of the special semantics that the process with PID 1 - has on UNIX. For example, it needs to reap all processes reparented to it, and should implement + default, if neither this option nor <option>--boot</option> is used, the selected program is run as the process + with PID 1, a mode only suitable for programs that are aware of the special semantics that the process with + PID 1 has on UNIX. For example, it needs to reap all processes reparented to it, and should implement <command>sysvinit</command> compatible signal handling (specifically: it needs to reboot on SIGINT, reexecute on SIGTERM, reload configuration on SIGHUP, and so on). With <option>--as-pid2</option> a minimal stub init - process is run as PID 1 and the selected binary is executed as PID 2 (and hence does not need to implement any + process is run as PID 1 and the selected program is executed as PID 2 (and hence does not need to implement any special semantics). The stub init process will reap processes as necessary and react appropriately to signals. It is recommended to use this mode to invoke arbitrary commands in containers, unless they have been modified to run correctly as PID 1. Or in other words: this switch should be used for pretty much all commands, @@ -291,9 +291,9 @@ <term><option>-b</option></term> <term><option>--boot</option></term> - <listitem><para>Automatically search for an init binary and invoke it as PID 1, instead of a shell or a user + <listitem><para>Automatically search for an init program and invoke it as PID 1, instead of a shell or a user supplied program. If this option is used, arguments specified on the command line are used as arguments for the - init binary. This option may not be combined with <option>--as-pid2</option>.</para> + init program. This option may not be combined with <option>--as-pid2</option>.</para> <para>The following table explains the different modes of invocation and relationship to <option>--as-pid2</option> (see above):</para> @@ -322,7 +322,7 @@ <row> <entry><option>--boot</option> specified</entry> - <entry>An init binary as automatically searched and run as PID 1 in the container. The passed parameters are used as invocation parameters for this process.</entry> + <entry>An init program is automatically searched for and run as PID 1 in the container. The passed parameters are used as invocation parameters for this process.</entry> </row> </tbody> |