diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-01-18 22:55:54 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-01-18 22:55:54 +0100 |
| commit | ba035df230e41bf9d70ebb47915c9472b7884412 (patch) | |
| tree | 37f5af1b2de9a93e15ee36ef080436619cfdbec9 /man | |
| parent | 0058d7b91ca90ee2dc605298bc5bac9bef0ededf (diff) | |
execute: make sending of SIGKILL on shutdown optional
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd.mount.xml | 10 | ||||
| -rw-r--r-- | man/systemd.service.xml | 20 | ||||
| -rw-r--r-- | man/systemd.socket.xml | 11 | ||||
| -rw-r--r-- | man/systemd.swap.xml | 11 |
4 files changed, 49 insertions, 3 deletions
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index e2a9f2272d..c7045e8422 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -240,6 +240,16 @@ </para></listitem> </varlistentry> + <varlistentry> + <term><varname>SendSIGKILL=</varname></term> + <listitem><para>Specifies whether to + send SIGKILL to remaining processes + after a timeout, if the normal + shutdown procedure left processes of + the mount around. Takes a boolean + value. Defaults to "yes". + </para></listitem> + </varlistentry> </variablelist> </refsect1> diff --git a/man/systemd.service.xml b/man/systemd.service.xml index e5262f6d60..ee4d393756 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -560,14 +560,17 @@ <option>control-group</option>.</para> <para>Processes will first be - terminated via SIGTERM (unless this is - changed via + terminated via SIGTERM (unless the + signal to send is changed via <varname>KillSignal=</varname>). If then after a delay (configured via the <varname>TimeoutSec=</varname> option) processes still remain, the termination request is repeated with - the SIGKILL signal. See + the SIGKILL signal (unless this is + disabled via the + <varname>SendSIGKILL=</varname> + option). See <citerefentry><refentrytitle>kill</refentrytitle><manvolnum>2</manvolnum></citerefentry> for more information.</para></listitem> @@ -582,6 +585,17 @@ </varlistentry> <varlistentry> + <term><varname>SendSIGKILL=</varname></term> + <listitem><para>Specifies whether to + send SIGKILL to remaining processes + after a timeout, if the normal + shutdown procedure left processes of + the service around. Takes a boolean + value. Defaults to "yes". + </para></listitem> + </varlistentry> + + <varlistentry> <term><varname>NonBlocking=</varname></term> <listitem><para>Set O_NONBLOCK flag for all file descriptors passed via diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 47ad913748..1aea2f89b1 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -528,6 +528,17 @@ </varlistentry> <varlistentry> + <term><varname>SendSIGKILL=</varname></term> + <listitem><para>Specifies whether to + send SIGKILL to remaining processes + after a timeout, if the normal + shutdown procedure left processes of + the socket around. Takes a boolean + value. Defaults to "yes". + </para></listitem> + </varlistentry> + + <varlistentry> <term><varname>Service=</varname></term> <listitem><para>Specifies the service unit name to activate on incoming diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index 45467039e9..45f8f40ae1 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -176,6 +176,17 @@ swap. Defaults to SIGTERM. </para></listitem> </varlistentry> + + <varlistentry> + <term><varname>SendSIGKILL=</varname></term> + <listitem><para>Specifies whether to + send SIGKILL to remaining processes + after a timeout, if the normal + shutdown procedure left processes of + the swap around. Takes a boolean + value. Defaults to "yes". + </para></listitem> + </varlistentry> </variablelist> </refsect1> |