X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcgroups-agent.c;h=1bbc8827d745c2a86d132c8f4904f44ed543f304;hp=6f7a857eaf9a74fa791d6a4ff6e3080a0b775da9;hb=189f6d82eef8bccb733f735281bed4588dccbbd9;hpb=22f4096ca96acd504ac74e7dfad96f07edb6da51

diff --git a/src/cgroups-agent.c b/src/cgroups-agent.c
index 6f7a857ea..1bbc8827d 100644
--- a/src/cgroups-agent.c
+++ b/src/cgroups-agent.c
@@ -39,26 +39,32 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+        log_set_target(LOG_TARGET_AUTO);
         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))) {
+        /* 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 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 LEGACY
                 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 LEGACY
+        }
+#endif
 
-                if (bus_check_peercred(bus) < 0) {
-                        log_error("Bus owner not root.");
-                        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 +80,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;
         }
 
@@ -82,6 +88,7 @@ int main(int argc, char *argv[]) {
 
 finish:
         if (bus) {
+                dbus_connection_flush(bus);
                 dbus_connection_close(bus);
                 dbus_connection_unref(bus);
         }