From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 12 Jan 2024 14:57:13 +0000 (+0100)
Subject: vmspawn: use SD_EVENT_SIGNAL_PROCMASK flag where possible
X-Git-Tag: v256-rc1~1172^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b1835050347767dfec278175f633f956878cf1a;p=thirdparty%2Fsystemd.git

vmspawn: use SD_EVENT_SIGNAL_PROCMASK flag where possible
---

diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index 2823c792250..5a69372b049 100644
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -684,10 +684,10 @@ static int run_virtual_machine(void) {
         }
 
         /* shutdown qemu when we are shutdown */
-        (void) sd_event_add_signal(event, NULL, SIGINT, on_orderly_shutdown, PID_TO_PTR(child_pid));
-        (void) sd_event_add_signal(event, NULL, SIGTERM, on_orderly_shutdown, PID_TO_PTR(child_pid));
+        (void) sd_event_add_signal(event, NULL, SIGINT | SD_EVENT_SIGNAL_PROCMASK, on_orderly_shutdown, PID_TO_PTR(child_pid));
+        (void) sd_event_add_signal(event, NULL, SIGTERM | SD_EVENT_SIGNAL_PROCMASK, on_orderly_shutdown, PID_TO_PTR(child_pid));
 
-        (void) sd_event_add_signal(event, NULL, SIGRTMIN+18, sigrtmin18_handler, NULL);
+        (void) sd_event_add_signal(event, NULL, (SIGRTMIN+18) | SD_EVENT_SIGNAL_PROCMASK, sigrtmin18_handler, NULL);
 
         /* Exit when the child exits */
         (void) sd_event_add_child(event, NULL, child_pid, WEXITED, on_child_exit, NULL);
@@ -748,7 +748,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGCHLD, SIGTERM, SIGINT, SIGRTMIN+18, -1) >= 0);
+        assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGCHLD, -1) >= 0);
 
         return run_virtual_machine();
 }