[systemd-commits] src/core

[Lennart Poettering]

 src/core/unit.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 97e0691f85da6e7ea131ce80bd61e2d47a737a61
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Feb 6 01:50:41 2014 +0100

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

diff --git a/src/core/unit.c b/src/core/unit.c
index 63576a4..345521a 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -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);