Commit f25626ed authored by Lennart Poettering's avatar Lennart Poettering
Browse files

main: disarm watchdog when preparing for reexecution

parent 79c07722
......@@ -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:
......
......@@ -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
......@@ -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");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment