X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=575bcee5b03579eb9a431c9458a3a8e7c8767f12;hb=01c1ce509420f682f6e774defb7d419d12fd29d1;hp=323cbf31462ed62634107d3c7cfb3e3c398dec7c;hpb=52306a952075183d4bdb20d9dc446cf26ef3deac;p=elogind.git

diff --git a/src/login/logind.c b/src/login/logind.c
index 323cbf314..575bcee5b 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -30,10 +30,11 @@
 #include "conf-parser.h"
 #include "bus-util.h"
 #include "bus-error.h"
+#include "logind.h"
 #include "udev-util.h"
 #include "formats-util.h"
-#include "signal-util.h"
-#include "logind.h"
+#include "label.h"
+#include "label.h"
 
 static void manager_free(Manager *m);
 
@@ -171,7 +172,7 @@ static void manager_free(Manager *m) {
                 udev_unref(m->udev);
 
         if (m->unlink_nologin)
-                (void) unlink("/run/nologin");
+                unlink("/run/nologin");
 
         bus_verify_polkit_async_registry_free(m->polkit_registry);
 
@@ -637,7 +638,7 @@ static int manager_connect_bus(Manager *m) {
         if (r < 0)
                 return log_error_errno(r, "Failed to add match for NameOwnerChanged: %m");
 
-        r = sd_bus_add_match(m->bus,
+	r = sd_bus_add_match(m->bus,
                              NULL,
                              "type='signal',"
                              "sender='org.freedesktop.systemd1',"
@@ -679,7 +680,7 @@ static int manager_connect_bus(Manager *m) {
                              match_reloading, m);
         if (r < 0)
                 return log_error_errno(r, "Failed to add match for Reloading: %m");
-
+#if 0
         r = sd_bus_call_method(
                         m->bus,
                         "org.freedesktop.systemd1",
@@ -692,7 +693,7 @@ static int manager_connect_bus(Manager *m) {
                 log_error("Failed to enable subscription: %s", bus_error_message(&error, r));
                 return r;
         }
-
+#endif // 0
         r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0);
         if (r < 0)
                 return log_error_errno(r, "Failed to register name: %m");
@@ -1123,8 +1124,8 @@ static int manager_run(Manager *m) {
 static int manager_parse_config_file(Manager *m) {
         assert(m);
 
-        return config_parse_many("/etc/systemd/logind.conf",
-                                 CONF_DIRS_NULSTR("systemd/logind.conf"),
+        return config_parse_many("/etc/elogind/elogind.conf",
+                                 CONF_DIRS_NULSTR("elogind/elogind.conf"),
                                  "Login\0",
                                  config_item_perf_lookup, logind_gperf_lookup,
                                  false, m);
@@ -1170,7 +1171,7 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        log_debug("logind running as pid "PID_FMT, getpid());
+        log_debug("systemd-logind running as pid "PID_FMT, getpid());
 
         sd_notify(false,
                   "READY=1\n"
@@ -1178,7 +1179,7 @@ int main(int argc, char *argv[]) {
 
         r = manager_run(m);
 
-        log_debug("logind stopped as pid "PID_FMT, getpid());
+        log_debug("systemd-logind stopped as pid "PID_FMT, getpid());
 
 finish:
         sd_notify(false,