summaryrefslogtreecommitdiff
path: root/src/basic/process-util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-11-03 15:54:28 +0100
committerLennart Poettering <lennart@poettering.net>2021-11-03 15:57:02 +0100
commit2c1612100daae9cef1b71c06ae4c4ec5f9378f09 (patch)
tree05273a2f1d84c971b35cc2f5331e978d8a22a248 /src/basic/process-util.c
parenta70877d8815819563f624a2a7973a18174361544 (diff)
downloadsystemd-2c1612100daae9cef1b71c06ae4c4ec5f9378f09.tar.gz
process-util: wait for processes we killed even if killing failed
The processes might be zombies in which case killing will fail, but reaping them still matters.
Diffstat (limited to 'src/basic/process-util.c')
-rw-r--r--src/basic/process-util.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 06493f7799..82bbda895f 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -857,8 +857,8 @@ int wait_for_terminate_with_timeout(pid_t pid, usec_t timeout) {
void sigkill_wait(pid_t pid) {
assert(pid > 1);
- if (kill(pid, SIGKILL) >= 0)
- (void) wait_for_terminate(pid, NULL);
+ (void) kill(pid, SIGKILL);
+ (void) wait_for_terminate(pid, NULL);
}
void sigkill_waitp(pid_t *pid) {
@@ -875,8 +875,8 @@ void sigkill_waitp(pid_t *pid) {
void sigterm_wait(pid_t pid) {
assert(pid > 1);
- if (kill_and_sigcont(pid, SIGTERM) >= 0)
- (void) wait_for_terminate(pid, NULL);
+ (void) kill_and_sigcont(pid, SIGTERM);
+ (void) wait_for_terminate(pid, NULL);
}
int kill_and_sigcont(pid_t pid, int sig) {