shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-09 13:57:42 +03:00
Code

Merge pull request #9661 from yuwata/add-sigprocmask-to-short-lived-daemons

Browse Source 
Add sigprocmask to short lived daemons
This commit is contained in:
Lennart Poettering 2018-07-20 09:50:28 +02:00 committed by GitHub
commit 4cd44f8e41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hostname/hostnamed.c
View File

@ -15,6 +15,7 @@
#include "parse-util.h"
#include "path-util.h"
#include "selinux-util.h"
#include "signal-util.h"
#include "strv.h"
#include "user-util.h"
#include "util.h"
@ -670,13 +671,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)

13
src/locale/localed.c
View File

@ -21,6 +21,7 @@
#include "macro.h"
#include "path-util.h"
#include "selinux-util.h"
#include "signal-util.h"
#include "string-util.h"
#include "strv.h"
#include "user-util.h"
@ -738,13 +739,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)

13
src/timedate/timedated.c
View File

@ -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)