Merge pull request #2911 from evverx/shutdown-watchdog-infinity

core: ShutdownWatchdogSec=infinity disables the watchdog logic too
2016-03-29 16:06:30 +02:00
parent 9081e5abab 5146c61928
commit a9447e0e48
1 changed files with 1 additions and 1 deletions
@@ -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