From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Tue, 29 Mar 2016 11:04:04 +0000 (+0000)
Subject: core: ShutdownWatchdogSec=infinity disables the watchdog logic too
X-Git-Tag: v230~233^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5146c61928de60bbedb81c5f4f47bf06528722a5;p=thirdparty%2Fsystemd.git

core: ShutdownWatchdogSec=infinity disables the watchdog logic too

This is a follow-up for 947292eef
---

diff --git a/src/core/main.c b/src/core/main.c
index e4e025e34ed..56df32426a9 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -2095,7 +2095,7 @@ finish:
 
                 assert(pos < ELEMENTSOF(command_line));
 
-                if (arm_reboot_watchdog && arg_shutdown_watchdog > 0) {
+                if (arm_reboot_watchdog && arg_shutdown_watchdog > 0 && arg_shutdown_watchdog != USEC_INFINITY) {
                         char *e;
 
                         /* If we reboot let's set the shutdown