shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-12 13:18:14 +03:00
Code

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

Browse Source 
core: ShutdownWatchdogSec=infinity disables the watchdog logic too
This commit is contained in:
Daniel Mack 2016-03-29 16:06:30 +02:00
commit a9447e0e48
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/main.c
View 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