summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2016-03-29 16:06:30 +0200
committerDaniel Mack <github@zonque.org>2016-03-29 16:06:30 +0200
commita9447e0e483e8e2bbd2b044cb78dbe7647da4e63 (patch)
tree9a2087a798778da111d259c7f38844be3b69ae7b /src
parent9081e5ababbd6ecdc59cef58dd191857f8639961 (diff)
parent5146c61928de60bbedb81c5f4f47bf06528722a5 (diff)
Merge pull request #2911 from evverx/shutdown-watchdog-infinity
core: ShutdownWatchdogSec=infinity disables the watchdog logic too
Diffstat (limited to 'src')
-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 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