Prep v228: Add remaining updates from upstream (3/3)

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

diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index 975ccaae2ae08ac66842d7587e3d171862e0c91b..f0371f23ee144953b44e347ab327b2fbf9709f56 100644 (file)
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -22,8 +22,9 @@
 #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_flush_close_unref_ sd_bus *bus = NULL;
@@ -34,6 +35,7 @@ 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();
@@ -44,7 +46,7 @@ int main(int argc, char *argv[]) {
          * 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);
+        r = bus_connect_system_systemd(&bus);
 #else
         /* Unlike in systemd where this has to use a private socket,
            since elogind doesn't associate control groups with services
@@ -63,7 +65,7 @@ int main(int argc, char *argv[]) {
                 /* 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
+#endif // 0
                 return EXIT_FAILURE;
         }
 
@@ -77,7 +79,7 @@ int main(int argc, char *argv[]) {
                 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
+#endif // 0
                 return EXIT_FAILURE;
         }