diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-03-15 20:21:54 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-03-15 20:21:54 -0400 |
| commit | 897d2029235b39c06d41ea9fbb1036ccdba0e811 (patch) | |
| tree | 842d7415923cfc7a876858086daae277e9d6b60a | |
| parent | 4cd35a79da4978d9bfcdf274cad5c50b2a81af0a (diff) | |
| parent | b3969f73f918754ddfdbbe05292171e1b29c4d4b (diff) | |
| download | systemd-897d2029235b39c06d41ea9fbb1036ccdba0e811.tar.gz | |
Merge pull request #2842 from petrosagg/nspawn-doc-fix
man: document missing KillSignal= .nspawn option
| -rw-r--r-- | man/systemd-nspawn.xml | 5 | ||||
| -rw-r--r-- | man/systemd.nspawn.xml | 12 |
2 files changed, 14 insertions, 3 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 86cdb4e124..7e87865ba8 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -595,9 +595,8 @@ order to trigger an orderly shutdown of the container. Defaults to SIGRTMIN+3 if <option>--boot</option> is used (on systemd-compatible init systems SIGRTMIN+3 - triggers an orderly shutdown). Takes a signal name like - <literal>SIGHUP</literal>, <literal>SIGTERM</literal> or - similar as argument.</para></listitem> + triggers an orderly shutdown). For a list of valid signals, see + <citerefentry project='man-pages'><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml index c07a4b0243..5ec878512a 100644 --- a/man/systemd.nspawn.xml +++ b/man/systemd.nspawn.xml @@ -224,6 +224,18 @@ </varlistentry> <varlistentry> + <term><option>KillSignal=</option></term> + + <listitem><para>Specify the process signal to send to the + container's PID 1 when nspawn itself receives SIGTERM, in + order to trigger an orderly shutdown of the container. + Defaults to SIGRTMIN+3 if <option>Boot=</option> is used + (on systemd-compatible init systems SIGRTMIN+3 triggers an + orderly shutdown). For a list of valid signals, see + <citerefentry project='man-pages'><refentrytitle>signal</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>Personality=</varname></term> <listitem><para>Configures the kernel personality for the |