summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-04-11 18:40:22 +0200
committerLennart Poettering <lennart@poettering.net>2012-04-11 18:40:22 +0200
commitf25626edf4c39bb9409cb165e6ce9551dd130661 (patch)
tree4d3f362139f1989b32f7cd2aa06eef6ca48b57d7 /src
parent79c077224be5a868d0bba66972ef9546dae85977 (diff)
main: disarm watchdog when preparing for reexecution
Diffstat (limited to 'src')
-rw-r--r--src/.gitignore4
-rw-r--r--src/main.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/.gitignore b/src/.gitignore
index 4b123f86d2..58d30247b7 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 6656cb4ef0..4e800e7430 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");