X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcgroups-agent%2Fcgroups-agent.c;h=0b0f4db56d8af92313962e54f11edc8fabb7e222;hb=f4c228f18281f3a7b305940329ca9b7a51fc430d;hp=3be4cff80199088d232b0f70d7dbceb88c5cf633;hpb=162255186046fa7a5e82859b7dba5a7909ce6fc4;p=elogind.git

diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index 3be4cff80..0b0f4db56 100644
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
@@ -22,11 +20,12 @@
 #include <stdlib.h>
 
 #include "sd-bus.h"
-#include "log.h"
 #include "bus-util.h"
+#include "musl_missing.h"
+#include "log.h"
 
 int main(int argc, char *argv[]) {
-        _cleanup_bus_close_unref_ sd_bus *bus = NULL;
+        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
         if (argc != 2) {
@@ -34,27 +33,51 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
+        elogind_set_program_name(argv[0]);
         log_set_target(LOG_TARGET_AUTO);
         log_parse_environment();
         log_open();
 
+#if 0
+        /* 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_connect_system_systemd(&bus);
+#else
         /* Unlike in systemd where this has to use a private socket,
-           since logind doesn't associate control groups with services
+           since elogind 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);
+#endif // 0
+
         if (r < 0) {
+#if 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");
+#else
+                /* If dbus isn't running or responding, there is nothing
+                 * we can do about it. */
                 log_debug_errno(r, "Failed to open system bus: %m");
+#endif // 0
                 return EXIT_FAILURE;
         }
 
         r = sd_bus_emit_signal(bus,
-                               "/org/freedesktop/systemd1/agent",
-                               "org.freedesktop.systemd1.Agent",
+                               "/org/freedesktop/elogind/agent",
+                               "org.freedesktop.elogind.Agent",
                                "Released",
                                "s", argv[1]);
         if (r < 0) {
+#if 0
+                log_debug_errno(r, "Failed to send signal message on private connection: %m");
+#else
                 log_debug_errno(r, "Failed to send signal message: %m");
+#endif // 0
                 return EXIT_FAILURE;
         }