Prep v220: elogind does not need to register with systemd1.*

[elogind.git] / src / login / logind.c

diff --git a/src/login/logind.c b/src/login/logind.c
index f84938a7fd0e935c69dd3a382d034c1d01680d25..73ba53d5b3270777217573ee7782f92eed9adabe 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -30,10 +30,10 @@
 #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"
 
 static void manager_free(Manager *m);
 
@@ -171,7 +171,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 +637,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 +679,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 +692,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");
@@ -787,8 +787,13 @@ static int manager_connect_console(Manager *m) {
                 return -EINVAL;
         }
 
-        assert_se(ignore_signals(SIGRTMIN + 1, -1) >= 0);
-        assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGRTMIN, -1) >= 0);
+        r = ignore_signals(SIGRTMIN + 1, -1);
+        if (r < 0)
+                return log_error_errno(r, "Cannot ignore SIGRTMIN + 1: %m");
+
+        r = sigprocmask_many(SIG_BLOCK, SIGRTMIN, -1);
+        if (r < 0)
+                return log_error_errno(r, "Cannot block SIGRTMIN: %m");
 
         r = sd_event_add_signal(m->event, NULL, SIGRTMIN, manager_vt_switch, m);
         if (r < 0)
@@ -1109,12 +1114,6 @@ static int manager_run(Manager *m) {
 
                 manager_gc(m, true);
 
-                r = manager_dispatch_delayed(m, false);
-                if (r < 0)
-                        return r;
-                if (r > 0)
-                        continue;
-
                 r = sd_event_run(m->event, (uint64_t) -1);
                 if (r < 0)
                         return r;
@@ -1153,7 +1152,6 @@ int main(int argc, char *argv[]) {
          * existence of /run/systemd/seats/ to determine whether
          * logind is available, so please always make sure this check
          * stays in. */
-        mkdir_label("/run/systemd", 0755);
         mkdir_label("/run/systemd/seats", 0755);
         mkdir_label("/run/systemd/users", 0755);
         mkdir_label("/run/systemd/sessions", 0755);
@@ -1172,7 +1170,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"
@@ -1180,7 +1178,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,