diff options
| author | Luca Boccassi <luca.boccassi@microsoft.com> | 2019-07-19 12:54:15 +0200 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@microsoft.com> | 2019-07-23 21:29:03 +0200 |
| commit | acafd7d8a6297fe40960d12dd86a974a53072cfb (patch) | |
| tree | d5c9ea7eca614c95fd9c49715338af014ce4e5fc /man/systemd-system.conf.xml | |
| parent | Merge pull request #12977 from yuwata/network-route-type-local-12975 (diff) | |
| download | systemd-acafd7d8a6297fe40960d12dd86a974a53072cfb.tar.xz systemd-acafd7d8a6297fe40960d12dd86a974a53072cfb.zip | |
core: add KExecWatchdogSec option
Rather than always enabling the shutdown WD on kexec, which might be
dangerous in case the kernel driver and/or the hardware implementation
does not reset the wd on kexec, add a new timer, disabled by default,
to let users optionally enable the shutdown WD on kexec separately
from the runtime and reboot ones. Advise in the documentation to
also use the runtime WD in conjunction with it.
Fixes: a637d0f9ecbe ("core: set shutdown watchdog on kexec too")
Diffstat (limited to 'man/systemd-system.conf.xml')
| -rw-r--r-- | man/systemd-system.conf.xml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 5b80479a0a..4dd4bf0ca8 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -128,6 +128,7 @@ <varlistentry> <term><varname>RuntimeWatchdogSec=</varname></term> <term><varname>ShutdownWatchdogSec=</varname></term> + <term><varname>KExecWatchdogSec=</varname></term> <listitem><para>Configure the hardware watchdog at runtime and at reboot. Takes a timeout value in seconds (or in other time units if suffixed with <literal>ms</literal>, <literal>min</literal>, <literal>h</literal>, @@ -149,7 +150,13 @@ phase of system shutdown, configure <varname>JobTimeoutSec=</varname> and <varname>JobTimeoutAction=</varname> in the <literal>[Unit]</literal> section of the <filename>shutdown.target</filename> unit. By default <varname>RuntimeWatchdogSec=</varname> defaults to 0 (off), and <varname>ShutdownWatchdogSec=</varname> to - 10min. These settings have no effect if a hardware watchdog is not available.</para></listitem> + 10min. <varname>KExecWatchdogSec=</varname> may be used to additionally enable the watchdog when kexec + is being executed rather than when rebooting. Note that if the kernel does not reset the watchdog on kexec (depending + on the specific hardware and/or driver), in this case the watchdog might not get disabled after kexec succeeds + and thus the system might get rebooted, unless <varname>RuntimeWatchdogSec=</varname> is also enabled at the same time. + For this reason it is recommended to enable <varname>KExecWatchdogSec=</varname> only if + <varname>RuntimeWatchdogSec=</varname> is also enabled. + These settings have no effect if a hardware watchdog is not available.</para></listitem> </varlistentry> <varlistentry> |