From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 8 Jan 2024 12:51:44 +0000 (+0100)
Subject: hostnamed: port to sd_event_set_signal_exit()
X-Git-Tag: v256-rc1~1226^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aefaeebef396366696d98da58982fbfd0592e2a1;p=thirdparty%2Fsystemd.git

hostnamed: port to sd_event_set_signal_exit()
---

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index d629a07d0fb..a5cac8b620e 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -1615,21 +1615,15 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1) >= 0);
-
         r = sd_event_default(&event);
         if (r < 0)
                 return log_error_errno(r, "Failed to allocate event loop: %m");
 
         (void) sd_event_set_watchdog(event, true);
 
-        r = sd_event_add_signal(event, NULL, SIGINT, NULL, NULL);
-        if (r < 0)
-                return log_error_errno(r, "Failed to install SIGINT handler: %m");
-
-        r = sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL);
+        r = sd_event_set_signal_exit(event, true);
         if (r < 0)
-                return log_error_errno(r, "Failed to install SIGTERM handler: %m");
+                return log_error_errno(r, "Failed to install SIGINT/SIGTERM handlers: %m");
 
         r = connect_bus(&context, event, &bus);
         if (r < 0)