From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 20 Jul 2018 05:59:36 +0000 (+0900)
Subject: locale: set sd_event_add_signal()
X-Git-Tag: v240~943^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50008ae48a8bf80c576b44bd36d176832b66669f;p=thirdparty%2Fsystemd.git

locale: set sd_event_add_signal()
---

diff --git a/src/locale/localed.c b/src/locale/localed.c
index b8f95b69a62..71115c59d78 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -21,6 +21,7 @@
 #include "macro.h"
 #include "path-util.h"
 #include "selinux-util.h"
+#include "signal-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "user-util.h"
@@ -738,13 +739,23 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1) >= 0);
+
         r = sd_event_default(&event);
         if (r < 0) {
                 log_error_errno(r, "Failed to allocate event loop: %m");
                 goto finish;
         }
 
-        sd_event_set_watchdog(event, true);
+        (void) sd_event_set_watchdog(event, true);
+
+        r = sd_event_add_signal(event, NULL, SIGINT, NULL, NULL);
+        if (r < 0)
+                return r;
+
+        r = sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL);
+        if (r < 0)
+                return r;
 
         r = connect_bus(&context, event, &bus);
         if (r < 0)