From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 12 Feb 2015 11:28:48 +0000 (+0100)
Subject: core: disarm shutdown watchdog if we fail to set timeout
X-Git-Tag: v219~63
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c2cc6b9aefb6f2085d3ca7eb9743093a17f751da

core: disarm shutdown watchdog if we fail to set timeout

Better safe than sorry, if drivers are stupid, and reset immediately on
device closing if the timeout could not be initialized.

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777735
---

diff --git a/src/core/main.c b/src/core/main.c
index 0749f0413..ba2de85bd 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -2021,8 +2021,8 @@ finish:
                         /* If we reboot let's set the shutdown
                          * watchdog and tell the shutdown binary to
                          * repeatedly ping it */
-                        watchdog_set_timeout(&arg_shutdown_watchdog);
-                        watchdog_close(false);
+                        r = watchdog_set_timeout(&arg_shutdown_watchdog);
+                        watchdog_close(r < 0);
 
                         /* Tell the binary how often to ping, ignore failure */
                         if (asprintf(&e, "WATCHDOG_USEC="USEC_FMT, arg_shutdown_watchdog) > 0)