X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus.c;fp=src%2Fdbus.c;h=f9250f13544fde91ab5bfaf309f26b70ffd45410;hp=81b4f53434666e8840a655f2a4435a4101fedc39;hb=9721b19968dd80ad187d03da214a2a8d28ead3ad;hpb=cbd37330bcd039587121a767280fc9fee597af6e

diff --git a/src/dbus.c b/src/dbus.c
index 81b4f5343..f9250f135 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -1196,7 +1196,9 @@ static void shutdown_connection(Manager *m, DBusConnection *c) {
         }
 
         dbus_connection_set_dispatch_status_function(c, NULL, NULL, NULL);
-        dbus_connection_flush(c);
+        /* system manager cannot afford to block on DBus */
+        if (m->running_as != MANAGER_SYSTEM)
+                dbus_connection_flush(c);
         dbus_connection_close(c);
         dbus_connection_unref(c);
 }