mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-02-12 21:57:27 +03:00
main: disarm watchdog when preparing for reexecution
This commit is contained in:
parent
79c077224b
commit
f25626edf4
3
TODO
3
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.
|
* properly handle .mount unit state tracking when two mount points are stacked one on top of another on the exact same mount point.
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
|
|
||||||
|
* Make RuntimeWatchdogUSec= property writable
|
||||||
|
|
||||||
* start polkit agent in systemctl, similar to the password agent, to allow
|
* start polkit agent in systemctl, similar to the password agent, to allow
|
||||||
gaining authorizations for privileged operations by entering a password:
|
gaining authorizations for privileged operations by entering a password:
|
||||||
Interface:
|
Interface:
|
||||||
|
4
src/.gitignore
vendored
4
src/.gitignore
vendored
@ -4,8 +4,4 @@ load-fragment-gperf.c
|
|||||||
load-fragment-gperf.gperf
|
load-fragment-gperf.gperf
|
||||||
org.freedesktop.systemd1.policy.in
|
org.freedesktop.systemd1.policy.in
|
||||||
org.freedesktop.systemd1.policy
|
org.freedesktop.systemd1.policy
|
||||||
gnome-ask-password-agent.c
|
|
||||||
systemd-interfaces.c
|
|
||||||
systemadm.c
|
|
||||||
wraplabel.c
|
|
||||||
99-systemd.rules
|
99-systemd.rules
|
||||||
|
@ -1631,6 +1631,11 @@ finish:
|
|||||||
|
|
||||||
assert(i <= ELEMENTSOF(args));
|
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);
|
execv(args[0], (char* const*) args);
|
||||||
|
|
||||||
log_error("Failed to reexecute: %m");
|
log_error("Failed to reexecute: %m");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user