summaryrefslogtreecommitdiff
path: root/src/core/system.conf.in
diff options
context:
space:
mode:
authorLuca Boccassi <luca.boccassi@microsoft.com>2019-07-19 11:54:15 +0100
committerLuca Boccassi <luca.boccassi@microsoft.com>2019-07-23 20:29:03 +0100
commitacafd7d8a6297fe40960d12dd86a974a53072cfb (patch)
treed5c9ea7eca614c95fd9c49715338af014ce4e5fc /src/core/system.conf.in
parent28fea36732cb832c399aac5288280d9cbe1047d9 (diff)
downloadsystemd-acafd7d8a6297fe40960d12dd86a974a53072cfb.tar.gz
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 'src/core/system.conf.in')
-rw-r--r--src/core/system.conf.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/system.conf.in b/src/core/system.conf.in
index 8617ec20aa..af6e5d9f62 100644
--- a/src/core/system.conf.in
+++ b/src/core/system.conf.in
@@ -27,6 +27,7 @@
#NUMAMask=
#RuntimeWatchdogSec=0
#ShutdownWatchdogSec=10min
+#KExecWatchdogSec=0
#WatchdogDevice=
#CapabilityBoundingSet=
#NoNewPrivileges=no