diff options
| -rw-r--r-- | src/dbus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dbus.c b/src/dbus.c index 81b4f53434..f9250f1354 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); } |