diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-04-11 18:40:22 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-04-11 18:40:22 +0200 |
| commit | f25626edf4c39bb9409cb165e6ce9551dd130661 (patch) | |
| tree | 4d3f362139f1989b32f7cd2aa06eef6ca48b57d7 | |
| parent | 79c077224be5a868d0bba66972ef9546dae85977 (diff) | |
main: disarm watchdog when preparing for reexecution
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | src/.gitignore | 4 | ||||
| -rw-r--r-- | src/main.c | 5 |
3 files changed, 8 insertions, 4 deletions
@@ -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 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"); |