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

timedate: set sd_event_add_signal()
---

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index ad662fb1cf2..4beded5de01 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -20,6 +20,7 @@
 #include "list.h"
 #include "path-util.h"
 #include "selinux-util.h"
+#include "signal-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "unit-def.h"
@@ -909,13 +910,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)