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=3fd0de698fb0719697570fddd5b709e4c3d78b9d;hb=133176702a03e5f6264f35c403dd7720d9e05c3f;hpb=53c6a358a8bb9e722ac6b8ba750acf576a61bf27

diff --git a/src/cgroups-agent.c b/src/cgroups-agent.c
index 3fd0de698..1bbc8827d 100644
--- a/src/cgroups-agent.c
+++ b/src/cgroups-agent.c
@@ -39,20 +39,28 @@ 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();
 
-
         /* 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
+         * 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:abstract=/org/freedesktop/systemd1/private", &error))) {
-                log_error("Failed to get D-Bus connection: %s", bus_error_message(&error));
-                goto finish;
+        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.");
@@ -85,7 +93,6 @@ finish:
                 dbus_connection_unref(bus);
         }
 
-
         if (m)
                 dbus_message_unref(m);