]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: ShutdownWatchdogSec=infinity disables the watchdog logic too 2911/head
authorEvgeny Vereshchagin <evvers@ya.ru>
Tue, 29 Mar 2016 11:04:04 +0000 (11:04 +0000)
committerEvgeny Vereshchagin <evvers@ya.ru>
Tue, 29 Mar 2016 11:13:55 +0000 (11:13 +0000)
This is a follow-up for 947292eef

src/core/main.c

index e4e025e34edbc1fc70b0c8422a83f721e68b1205..56df32426a9c121d07575af1ffbb9364fc5bb753 100644 (file)
@@ -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