summaryrefslogtreecommitdiffstats
path: root/src/main.c
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/main.c
parentput acl.la in 'if HAVE_ACL' and rename acl.[ch] to acl-util.[ch] (diff)
downloadsystemd-f25626edf4c39bb9409cb165e6ce9551dd130661.tar.xz
systemd-f25626edf4c39bb9409cb165e6ce9551dd130661.zip
main: disarm watchdog when preparing for reexecution
Diffstat (limited to '')
-rw-r--r--src/main.c5
1 files changed, 5 insertions, 0 deletions
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");