getty: move automatic serial getty logic into generator

[elogind.git] / src / cgroups-agent.c

diff --git a/src/cgroups-agent.c b/src/cgroups-agent.c
index 3fd0de698fb0719697570fddd5b709e4c3d78b9d..18612eca3c74fa46368dc92573fce4e999fd318f 100644 (file)
--- a/src/cgroups-agent.c
+++ b/src/cgroups-agent.c
@@ -46,13 +46,22 @@ int main(int argc, char *argv[]) {
 
         /* 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=/dev/.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.");