summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLuca Boccassi <luca.boccassi@microsoft.com>2019-07-18 14:25:30 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-07-18 22:31:43 +0200
commita637d0f9ecbeae2a6bdca0fb924bf8961a4cfa47 (patch)
treec04589a0e06a70feb5117fcf1172c1bc9bc7a69d /src/core
parentdeeabb45ae2b7a7ea34563222887751bf1474c5c (diff)
downloadsystemd-a637d0f9ecbeae2a6bdca0fb924bf8961a4cfa47.tar.gz
systemd-a637d0f9ecbeae2a6bdca0fb924bf8961a4cfa47.tar.bz2
systemd-a637d0f9ecbeae2a6bdca0fb924bf8961a4cfa47.zip
core: set shutdown watchdog on kexec too
At the moment the shutdown watchdog is set only when rebooting. The set of "things that can go wrong" is not too far off when kexec'ing and in fact we have a use case where it would be useful - moving to a new kernel image.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/main.c b/src/core/main.c
index c6294c2f74..8de3d4753d 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1396,7 +1396,7 @@ static int become_shutdown(
assert(pos < ELEMENTSOF(command_line));
- if (streq(shutdown_verb, "reboot") &&
+ if (STR_IN_SET(shutdown_verb, "reboot", "kexec") &&
arg_shutdown_watchdog > 0 &&
arg_shutdown_watchdog != USEC_INFINITY) {