From: Luca Boccassi <luca.boccassi@microsoft.com>
Date: Thu, 18 Jul 2019 13:25:30 +0000 (+0100)
Subject: core: set shutdown watchdog on kexec too
X-Git-Tag: v243-rc1~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a637d0f9ecbeae2a6bdca0fb924bf8961a4cfa47;p=thirdparty%2Fsystemd.git

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

diff --git a/src/core/main.c b/src/core/main.c
index c6294c2f741..8de3d4753d6 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) {