Fix various build failures with the latest systemd updates.

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index a8de2424dd9f0ff78c93a6cb9a61323612e2fbf8..9b4a5608552c65c71c7b29e2ec64dc36f756371b 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1037,7 +1037,11 @@ int cg_get_xattr(const char *controller, const char *path, const char *name, voi
 int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
         _cleanup_fclose_ FILE *f = NULL;
         char line[LINE_MAX];
+#if 0 // At elogind we do not want that (false alarm) "maybe uninitialized" warning
         const char *fs, *controller_str;
+#else
+        const char *fs, *controller_str = NULL;
+#endif // 0
         size_t cs = 0;
         int unified;
 

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 9ee0547fc8edaa4a8e20b3397c23c6fa53af6458..fa17fc0348cfa9189de1a6e31df16b6f75596940 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -34,7 +34,7 @@
 #include "alloc-util.h"
 #include "extract-word.h"
 #include "fs-util.h"
-#include "glob-util.h"
+//#include "glob-util.h"
 #include "log.h"
 #include "macro.h"
 #include "missing.h"

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 742c216691b4b0dcf63d3afd117fdf550206caee..664defceb8980a60d28c648b1671886eafa69352 100644 (file)
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -21,7 +21,7 @@
 #include <fnmatch.h>
 
 #include "alloc-util.h"
-#include "bpf-firewall.h"
+//#include "bpf-firewall.h"
 #include "cgroup-util.h"
 #include "cgroup.h"
 #include "fd-util.h"

diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index dc4b4cadf00a07af65e08e65706b5064f47cf168..14aa68cbf11381f721545ec3f9b272a03eb86fad 100644 (file)
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -24,7 +24,7 @@
 //#include "list.h"
 //#include "time-util.h"
 #include "cgroup-util.h"
-#include "ip-address-access.h"
+//#include "ip-address-access.h"
 
 #if 0 /// UNNEEDED by elogind
 typedef struct CGroupContext CGroupContext;

diff --git a/src/login/elogind-dbus.c b/src/login/elogind-dbus.c
index a9b39c238835162535daefbf20e83c81ecd01154..ede2bfd356a75d7d9009cbf874d9c44128de063d 100644 (file)
--- a/src/login/elogind-dbus.c
+++ b/src/login/elogind-dbus.c
@@ -380,6 +380,22 @@ int method_reboot(sd_bus_message *message, void *userdata, sd_bus_error *error)
                         error);
 }
 
+int method_halt(sd_bus_message *message, void *userdata, sd_bus_error *error) {
+        Manager *m = userdata;
+
+        log_debug_elogind("%s called", __FUNCTION__);
+
+        return method_do_shutdown_or_sleep(
+                        m, message,
+                        HANDLE_HALT,
+                        INHIBIT_SHUTDOWN,
+                        "org.freedesktop.login1.halt",
+                        "org.freedesktop.login1.halt-multiple-sessions",
+                        "org.freedesktop.login1.halt-ignore-inhibit",
+                        NULL,
+                        error);
+}
+
 int method_suspend(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         Manager *m = userdata;
 

diff --git a/src/login/elogind-dbus.h b/src/login/elogind-dbus.h
index 87ab2b8691766860a08fb4a29f63ec606f787d97..61620831696b74d793f1ad33cf3f8c6cf13b2662 100644 (file)
--- a/src/login/elogind-dbus.h
+++ b/src/login/elogind-dbus.h
@@ -25,6 +25,7 @@
 
 int manager_scheduled_shutdown_handler(sd_event_source *s, uint64_t usec,
                                        void *userdata);
+int method_halt        (sd_bus_message *message, void *userdata, sd_bus_error *error);
 int method_hibernate   (sd_bus_message *message, void *userdata, sd_bus_error *error);
 int method_hybrid_sleep(sd_bus_message *message, void *userdata, sd_bus_error *error);
 int method_poweroff    (sd_bus_message *message, void *userdata, sd_bus_error *error);

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 45daf54fb56db1889fe0834300a0ab7745386ccf..4948d2ee7622e8542b7ac2bcbdee04f3795058dc 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -27,7 +27,7 @@
 
 #include "alloc-util.h"
 #include "bus-error.h"
-#include "bus-unit-util.h"
+//#include "bus-unit-util.h"
 #include "bus-util.h"
 //#include "cgroup-show.h"
 #include "cgroup-util.h"

diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index b328432ad33909a5cac6bfa6be78ceeeed55c547..defd83e262fe68e17b5e8aa9723a2d245002e7fc 100644 (file)
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -451,6 +451,7 @@ int clean_ipc_internal(uid_t uid, gid_t gid, bool rm) {
                         ret = r;
         }
 
+#if 0 /// Nothing in elogind uses mqueues
         r = clean_posix_mq(uid, gid, rm);
         if (r != 0) {
                 if (!rm)
@@ -458,6 +459,7 @@ int clean_ipc_internal(uid_t uid, gid_t gid, bool rm) {
                 if (ret == 0)
                         ret = r;
         }
+#endif // 0
 
         return ret;
 }