Merge pull request #23565 from bnf/man-nspawn-wording

man: nspawn related wording improvements
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2022-05-30 21:50:57 +02:00
committed by GitHub
+5 -5
View File
@@ -74,7 +74,7 @@
<para>As a safety check <command>systemd-nspawn</command> will verify the existence of
<filename>/usr/lib/os-release</filename> or <filename>/etc/os-release</filename> in the container tree before
starting the container (see
booting a container (see
<citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>). It might be
necessary to add this file to the container tree manually if the OS of the container is too old to contain this
file out-of-the-box.</para>
@@ -84,8 +84,8 @@
template unit file <filename>systemd-nspawn@.service</filename> is provided to make this easy, taking the container
name as instance identifier. Note that different default options apply when <command>systemd-nspawn</command> is
invoked by the template unit file than interactively on the command line. Most importantly the template unit file
makes use of the <option>--boot</option> which is not the default in case <command>systemd-nspawn</command> is
invoked from the interactive command line. Further differences with the defaults are documented along with the
makes use of the <option>--boot</option> option which is not the default in case <command>systemd-nspawn</command>
is invoked from the interactive command line. Further differences with the defaults are documented along with the
various supported options below.</para>
<para>The <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> tool may
@@ -105,7 +105,7 @@
<para>Note that running two <command>systemd-nspawn</command> containers from the same directory tree will not make
processes in them see each other. The PID namespace separation of the two containers is complete and the containers
will share very few runtime objects except for the underlying file system. Use
will share very few runtime objects except for the underlying file system. Rather use
<citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
<command>login</command> or <command>shell</command> commands to request an additional login session in a running
container.</para>
@@ -121,7 +121,7 @@
<refsect1>
<title>Options</title>
<para>If option <option>-b</option> is specified, the arguments
<para>If option <option>--boot</option> is specified, the arguments
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