diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-02-28 04:25:40 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-02-28 04:25:40 +0100 |
| commit | 870c4365cf3d407270788abe14d216a636ecf6c3 (patch) | |
| tree | 02e03c0d0c37cc4a43112147f0860531f474519e /man/systemd-nspawn.xml | |
| parent | systemd-activate: add a socket-activation test tool (diff) | |
| download | systemd-870c4365cf3d407270788abe14d216a636ecf6c3.tar.xz systemd-870c4365cf3d407270788abe14d216a636ecf6c3.zip | |
man: document systemd-nspawn behaviour with -b
Cf. cb96a2c69 and 1ddf879a.
Diffstat (limited to 'man/systemd-nspawn.xml')
| -rw-r--r-- | man/systemd-nspawn.xml | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 41477b46d5..8adcd946b0 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -51,7 +51,14 @@ <cmdsynopsis> <command>systemd-nspawn</command> <arg choice="opt" rep="repeat">OPTIONS</arg> - <arg choice="opt">COMMAND</arg> + <arg choice="opt"><replaceable>COMMAND</replaceable> + <arg choice="opt" rep="repeat">ARGS</arg> + </arg> + </cmdsynopsis> + <cmdsynopsis> + <command>systemd-nspawn</command> + <arg choice="plain">-b</arg> + <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt" rep="repeat">ARGS</arg> </cmdsynopsis> </refsynopsisdiv> @@ -131,10 +138,16 @@ <refsect1> <title>Options</title> - <para>If no arguments are passed the container is set - up and a shell started in it, otherwise the passed - command and arguments are executed in it. The - following options are understood:</para> + <para>If option <option>-b</option> is specified, the + arguments are used as arguments for the init + binary. 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>-b</option> is not used and no + arguments are specifed, a shell is launched in the + container.</para> + + <para>The following options are understood:</para> <variablelist> <varlistentry> @@ -170,7 +183,10 @@ <listitem><para>Automatically search for an init binary and invoke it instead of a shell or a user supplied - program.</para></listitem> + program. If this option is used, arguments + specified on the command line are used + as arguments for the init binary. + </para></listitem> </varlistentry> <varlistentry> |