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

diff --git a/src/login/logind.c b/src/login/logind.c
index bcc268be8cbf62011ac9ffc99bff57808c297cab..73ba53d5b3270777217573ee7782f92eed9adabe 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -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");
 
         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',"
                              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");
                              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",
         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;
         }
                 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");
         r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0);
         if (r < 0)
                 return log_error_errno(r, "Failed to register name: %m");