From 5146c61928de60bbedb81c5f4f47bf06528722a5 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Tue, 29 Mar 2016 11:04:04 +0000 Subject: core: ShutdownWatchdogSec=infinity disables the watchdog logic too This is a follow-up for 947292eef --- src/core/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/core/main.c b/src/core/main.c index e4e025e34e..56df32426a 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 -- cgit v1.2.3-54-g00ecf