From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 16 Feb 2024 17:55:21 +0000 (+0100)
Subject: importctl: modernize signal handling
X-Git-Tag: v256-rc1~671^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=663a15e7cc7c09d05bbfe8ac52173e73218bf410;p=thirdparty%2Fsystemd.git

importctl: modernize signal handling
---

diff --git a/src/import/importctl.c b/src/import/importctl.c
index 742f13002d2..0cf641b9900 100644
--- a/src/import/importctl.c
+++ b/src/import/importctl.c
@@ -147,13 +147,11 @@ static int transfer_image_common(sd_bus *bus, sd_bus_message *m) {
         if (r < 0)
                 return bus_log_parse_error(r);
 
-        assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1) >= 0);
-
         if (!arg_quiet)
                 log_info("Enqueued transfer job %u. Press C-c to continue download in background.", id);
 
-        (void) sd_event_add_signal(event, NULL, SIGINT, transfer_signal_handler, UINT32_TO_PTR(id));
-        (void) sd_event_add_signal(event, NULL, SIGTERM, transfer_signal_handler, UINT32_TO_PTR(id));
+        (void) sd_event_add_signal(event, NULL, SIGINT|SD_EVENT_SIGNAL_PROCMASK, transfer_signal_handler, UINT32_TO_PTR(id));
+        (void) sd_event_add_signal(event, NULL, SIGTERM|SD_EVENT_SIGNAL_PROCMASK, transfer_signal_handler, UINT32_TO_PTR(id));
 
         r = sd_event_loop(event);
         if (r < 0)