diff options
| -rw-r--r-- | src/cgroups-agent/cgroups-agent.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c index 0e3d2b7541..a47949a180 100644 --- a/src/cgroups-agent/cgroups-agent.c +++ b/src/cgroups-agent/cgroups-agent.c @@ -48,26 +48,19 @@ int main(int argc, char *argv[]) { * this to avoid an activation loop when we start dbus when we * are called when the dbus service is shut down. */ - if (!(bus = dbus_connection_open_private("unix:path=/run/systemd/private", &error))) { -#ifndef NOLEGACY - dbus_error_free(&error); - - /* Retry with the pre v21 socket name, to ease upgrades */ - if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", &error))) { -#endif - log_error("Failed to get D-Bus connection: %s", bus_error_message(&error)); - goto finish; - } -#ifndef NOLEGACY + bus = dbus_connection_open_private("unix:path=/run/systemd/private", &error); + if (!bus) { + log_warning("Failed to get D-Bus connection: %s", bus_error_message(&error)); + goto finish; } -#endif 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"))) { + m = dbus_message_new_signal("/org/freedesktop/systemd1/agent", "org.freedesktop.systemd1.Agent", "Released"); + if (!m) { log_error("Could not allocate signal message."); goto finish; } |