picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core: only send SIGHUP when doing first kill, not when doing final sigkill

Browse source
This commit is contained in:
Lennart Poettering 2014-02-06 01:50:41 +01:00
parent 99bd4af0c7
commit 97e0691f85
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/unit.c
View file

@ -2944,7 +2944,7 @@ int unit_kill_context(
if (!main_pid_alien)
wait_for_exit = true;
if (c->send_sighup)
if (c->send_sighup && !sigkill)
kill(main_pid, SIGHUP);
}
}
@ -2960,7 +2960,7 @@ int unit_kill_context(
} else {
wait_for_exit = true;
if (c->send_sighup)
if (c->send_sighup && !sigkill)
kill(control_pid, SIGHUP);
}
}
@ -2991,7 +2991,7 @@ int unit_kill_context(
* gets fixed we really should correct
* that. */
if (c->send_sighup) {
if (c->send_sighup && !sigkill) {
set_free(pid_set);
pid_set = unit_pid_set(main_pid, control_pid);