main: disarm watchdog when preparing for reexecution

diff --git a/TODO b/TODO
index 590351395bf89afab0ed5c1e88f4519182a564ce..d94aba5639f132344d8643a16bd376afa5f212ae 100644 (file)
--- a/TODO
+++ b/TODO
@@ -16,6 +16,9 @@ Bugfixes:
 * properly handle .mount unit state tracking when two mount points are stacked one on top of another on the exact same mount point.
 
 Features:
+
+* Make RuntimeWatchdogUSec= property writable
+
 * start polkit agent in systemctl, similar to the password agent, to allow
   gaining authorizations for privileged operations by entering a password:
   Interface:

diff --git a/src/.gitignore b/src/.gitignore
index 4b123f86d213ea00aa8426f1946b369ee13cc66f..58d30247b7122626575ff3bcc6b65e86626ee38a 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -4,8 +4,4 @@ load-fragment-gperf.c
 load-fragment-gperf.gperf
 org.freedesktop.systemd1.policy.in
 org.freedesktop.systemd1.policy
-gnome-ask-password-agent.c
-systemd-interfaces.c
-systemadm.c
-wraplabel.c
 99-systemd.rules

diff --git a/src/main.c b/src/main.c
index 6656cb4ef093bb6499f918bcf7db13d436e9ba48..4e800e7430224f0a0219b1dd88fcea2e49cbc980 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1631,6 +1631,11 @@ finish:
 
                 assert(i <= ELEMENTSOF(args));
 
+                /* Close and disarm the watchdog, so that the new
+                 * instance can reinitialize it, but doesn't get
+                 * rebooted while we do that */
+                watchdog_close(true);
+
                 execv(args[0], (char* const*) args);
 
                 log_error("Failed to reexecute: %m");