From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Feb 2023 09:25:27 +0000 (+0100)
Subject: importd: hook up memory pressure, SIGRTMIN-18 (and in fact SIGINT + SIGTERM)
X-Git-Tag: v254-rc1~1142^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82fa9f28f9aba7d5dc47ab99fb148688ffae78f7;p=thirdparty%2Fsystemd.git

importd: hook up memory pressure, SIGRTMIN-18 (and in fact SIGINT + SIGTERM)
---

diff --git a/src/import/importd.c b/src/import/importd.c
index 5f7b9c3163d..ed757019cf9 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -10,6 +10,7 @@
 #include "bus-get-properties.h"
 #include "bus-log-control-api.h"
 #include "bus-polkit.h"
+#include "common-signal.h"
 #include "constants.h"
 #include "env-util.h"
 #include "fd-util.h"
@@ -636,7 +637,23 @@ static int manager_new(Manager **ret) {
         if (r < 0)
                 return r;
 
-        sd_event_set_watchdog(m->event, true);
+        (void) sd_event_set_watchdog(m->event, true);
+
+        r = sd_event_add_signal(m->event, NULL, SIGINT, NULL, NULL);
+        if (r < 0)
+                return r;
+
+        r = sd_event_add_signal(m->event, NULL, SIGTERM, NULL, NULL);
+        if (r < 0)
+                return r;
+
+        r = sd_event_add_signal(m->event, NULL, SIGRTMIN+18, sigrtmin18_handler, NULL);
+        if (r < 0)
+                return r;
+
+        r = sd_event_add_memory_pressure(m->event, NULL, NULL, NULL);
+        if (r < 0)
+                log_debug_errno(r, "Failed allocate memory pressure event source, ignoring: %m");
 
         r = sd_bus_default_system(&m->bus);
         if (r < 0)
@@ -1389,7 +1406,7 @@ static int run(int argc, char *argv[]) {
 
         umask(0022);
 
-        assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGCHLD, -1) >= 0);
+        assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGCHLD, SIGTERM, SIGINT, SIGRTMIN+18, -1) >= 0);
 
         r = manager_new(&m);
         if (r < 0)