summaryrefslogtreecommitdiff
path: root/src/dbus-manager.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-04-28 22:07:01 +0200
committerLennart Poettering <lennart@poettering.net>2011-04-28 22:07:01 +0200
commitb23de6af893c11da4286bc416455cd0926d1532e (patch)
treee2a7e00fcedc9b8314b7035f3a4fdb6eca05bead /src/dbus-manager.c
parentb4bd51448fa8b7574e9a92af50b58da9bb0dfb5e (diff)
dbus: make daemon reexecution synchronous
We simply keep open copies of the dbus connections across the reexecution and close them as last step of it. A client can thus simply wait until its connection is dropped to know when the reexecution is finished. https://bugzilla.redhat.com/show_bug.cgi?id=698198
Diffstat (limited to 'src/dbus-manager.c')
-rw-r--r--src/dbus-manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus-manager.c b/src/dbus-manager.c
index 9776b0b9de..797e53d10f 100644
--- a/src/dbus-manager.c
+++ b/src/dbus-manager.c
@@ -922,8 +922,8 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
} else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "Reexecute")) {
- if (!(reply = dbus_message_new_method_return(message)))
- goto oom;
+ /* We don't send a reply back here, the client should
+ * just wait for us disconnecting. */
m->exit_code = MANAGER_REEXECUTE;