1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 01:55:32 +03:00

Merge pull request #2842 from petrosagg/nspawn-doc-fix

man: document missing KillSignal= .nspawn option
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-03-15 20:21:54 -04:00
commit 897d202923
2 changed files with 14 additions and 3 deletions

View File

@ -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>

View File

@ -223,6 +223,18 @@
all cases.</para></listitem>
</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>