X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcgroups-agent%2Fcgroups-agent.c;fp=src%2Fcgroups-agent%2Fcgroups-agent.c;h=3be4cff80199088d232b0f70d7dbceb88c5cf633;hb=162255186046fa7a5e82859b7dba5a7909ce6fc4;hp=529e8430303207458f15f9074ac9492b4fd1d808;hpb=6f5035f2db6ab7b4beae46c44b95e6a8b6d956b5;p=elogind.git

diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index 529e84303..3be4cff80 100644
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -38,17 +38,13 @@ 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. */
-
-        r = bus_open_system_systemd(&bus);
+        /* Unlike in systemd where this has to use a private socket,
+           since logind doesn't associate control groups with services
+           and doesn't manage the dbus service, we can just use the
+           system bus.  */
+        r = sd_bus_open_system(&bus);
         if (r < 0) {
-                /* If we couldn't connect we assume this was triggered
-                 * while systemd got restarted/transitioned from
-                 * initrd to the system, so let's ignore this */
-                log_debug_errno(r, "Failed to get D-Bus connection: %m");
+                log_debug_errno(r, "Failed to open system bus: %m");
                 return EXIT_FAILURE;
         }
 
@@ -58,7 +54,7 @@ int main(int argc, char *argv[]) {
                                "Released",
                                "s", argv[1]);
         if (r < 0) {
-                log_debug_errno(r, "Failed to send signal message on private connection: %m");
+                log_debug_errno(r, "Failed to send signal message: %m");
                 return EXIT_FAILURE;
         }