diff options
Diffstat (limited to 'src/cgroups-agent.c')
| -rw-r--r-- | src/cgroups-agent.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/cgroups-agent.c b/src/cgroups-agent.c index 30aeede943..3fd0de698f 100644 --- a/src/cgroups-agent.c +++ b/src/cgroups-agent.c @@ -43,22 +43,20 @@ int main(int argc, char *argv[]) { log_parse_environment(); log_open(); - /* If possible we go via the system bus, to make sure that - * session instances get the messages. If not possible we talk - * to the system instance directly. */ - if (!(bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error))) { - - dbus_error_free(&error); - - if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", &error))) { - log_error("Failed to get D-Bus connection: %s", bus_error_message(&error)); - goto finish; - } - - if (bus_check_peercred(bus) < 0) { - log_error("Bus owner not root."); - goto finish; - } + + /* We send this event to the private D-Bus socket and then the + * system instance will forward this to the system bus. We do + * this to avoid an actviation loop when we start dbus when we + * are called when the dbus service is shut down. */ + + if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", &error))) { + log_error("Failed to get D-Bus connection: %s", bus_error_message(&error)); + goto finish; + } + + if (bus_check_peercred(bus) < 0) { + log_error("Bus owner not root."); + goto finish; } if (!(m = dbus_message_new_signal("/org/freedesktop/systemd1/agent", "org.freedesktop.systemd1.Agent", "Released"))) { @@ -74,7 +72,7 @@ int main(int argc, char *argv[]) { } if (!dbus_connection_send(bus, m, NULL)) { - log_error("Failed to send signal message."); + log_error("Failed to send signal message on private connection."); goto finish; } @@ -87,6 +85,7 @@ finish: dbus_connection_unref(bus); } + if (m) dbus_message_unref(m); |