[systemd-commits] TODO src/.gitignore src/main.c

[Lennart Poettering]

 TODO           |    3 +++
 src/.gitignore |    4 ----
 src/main.c     |    5 +++++
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit f25626edf4c39bb9409cb165e6ce9551dd130661
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Apr 11 18:40:22 2012 +0200

    main: disarm watchdog when preparing for reexecution

diff --git a/TODO b/TODO
index 5903513..d94aba5 100644
--- 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 4b123f8..58d3024 100644
--- 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 6656cb4..4e800e7 100644
--- 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");