summaryrefslogtreecommitdiff
path: root/src/login/logind.c
diff options
context:
space:
mode:
authorStefan Stefanović <stefanx2ovic@gmail.com>2018-11-09 08:50:01 +0100
committerSven Eden <sven.eden@prydeworx.com>2018-11-10 10:00:20 +0100
commitc35c7b3a589e8f7f99e9fd0e7e853210af5fea9c (patch)
treeb791330cb6a9ecdc532b38ed0d495360a1add5a0 /src/login/logind.c
parent45f85d95ed11f4e85ee8519f8bedfb75d9e5bc73 (diff)
elogind: Use SIG_BLOCK before signal handler registration.
Diffstat (limited to 'src/login/logind.c')
-rw-r--r--src/login/logind.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/login/logind.c b/src/login/logind.c
index fcb70e1a9..d9b777fed 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -89,6 +89,7 @@ static int manager_new(Manager **ret) {
if (r < 0)
return r;
+#if 0 /// elogind uses its own signal handler, installed at elogind_manager_new()
r = sd_event_add_signal(m->event, NULL, SIGINT, NULL, NULL);
if (r < 0)
return r;
@@ -96,6 +97,7 @@ static int manager_new(Manager **ret) {
r = sd_event_add_signal(m->event, NULL, SIGTERM, NULL, NULL);
if (r < 0)
return r;
+#endif // 0
(void) sd_event_set_watchdog(m->event, true);
@@ -1151,9 +1153,6 @@ static int manager_startup(Manager *m) {
if (r < 0)
return log_error_errno(r, "Failed to register SIGHUP handler: %m");
-#if 1 /// elogind needs some extra preparations before connecting...
- elogind_manager_startup(m);
-#endif // 1
/* Connect to utmp */
manager_connect_utmp(m);