From f6660fc3afb7005079147e797dfa6badc05ae102 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Thu, 8 Nov 2018 19:54:35 +0100 Subject: Prep v239.2: Fix signal registration failure (#90) The behaviour of sd_event_add_signal() has changed, it is no longer neccessary to mask the signal beforehand. Actually the masking causes it to be ignored, and thus the registration of the signal handler to fail. Bug: #90 Closes: #90 Signed-off-by: Sven Eden --- src/login/elogind.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'src') diff --git a/src/login/elogind.c b/src/login/elogind.c index 9fe52a94c..d5cf63336 100644 --- a/src/login/elogind.c +++ b/src/login/elogind.c @@ -461,17 +461,14 @@ int elogind_manager_startup(Manager *m) { assert(m); - assert_se(sigprocmask_many(SIG_SETMASK, NULL, SIGINT, -1) >= 0); r = sd_event_add_signal(m->event, NULL, SIGINT, elogind_signal_handler, m); if (r < 0) return log_error_errno(r, "Failed to register SIGINT handler: %m"); - assert_se(sigprocmask_many(SIG_SETMASK, NULL, SIGQUIT, -1) >= 0); r = sd_event_add_signal(m->event, NULL, SIGQUIT, elogind_signal_handler, m); if (r < 0) return log_error_errno(r, "Failed to register SIGQUIT handler: %m"); - assert_se(sigprocmask_many(SIG_SETMASK, NULL, SIGTERM, -1) >= 0); r = sd_event_add_signal(m->event, NULL, SIGTERM, elogind_signal_handler, m); if (r < 0) return log_error_errno(r, "Failed to register SIGTERM handler: %m"); -- cgit v1.2.1