X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcgroups-agent.c;h=7f001e67d125fe5fc59a081e48751644d9b35102;hp=7b4fca245dd6237f4be939ecec4a15bb80bbba0b;hb=ee17ee7c5cc22c286f943578918beaa78bbc86db;hpb=35b8ca3aaf8cb044ad76675dfcad89e000dd4a5c

diff --git a/src/cgroups-agent.c b/src/cgroups-agent.c
index 7b4fca245..7f001e67d 100644
--- a/src/cgroups-agent.c
+++ b/src/cgroups-agent.c
@@ -43,16 +43,24 @@ int main(int argc, char *argv[]) {
         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 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);