diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-03-29 23:31:38 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-03-29 23:31:38 +0200 |
| commit | cd25cce98f5cc930202212c3c9c13605c09698b4 (patch) | |
| tree | 7c186394fed8a04e5ad8fef37eda670282f2a08e /src/socket.c | |
| parent | 12235040ec94279ad92693dcfae0a4d9c35a6076 (diff) | |
exec: drop process group kill mode since it has little use and confuses the user
Diffstat (limited to 'src/socket.c')
| -rw-r--r-- | src/socket.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/socket.c b/src/socket.c index 9045a2fc85..72be0e2235 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1040,9 +1040,7 @@ static void socket_enter_signal(Socket *s, SocketState state, bool success) { int sig = (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_FINAL_SIGTERM) ? s->exec_context.kill_signal : SIGKILL; if (s->control_pid > 0) { - if (kill_and_sigcont(s->exec_context.kill_mode == KILL_PROCESS_GROUP ? - -s->control_pid : - s->control_pid, sig) < 0 && errno != ESRCH) + if (kill_and_sigcont(s->control_pid, sig) < 0 && errno != ESRCH) log_warning("Failed to kill control process %li: %m", (long) s->control_pid); else @@ -1837,7 +1835,7 @@ static int socket_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError } if (s->control_pid > 0) - if (kill(mode == KILL_PROCESS_GROUP ? -s->control_pid : s->control_pid, signo) < 0) + if (kill(s->control_pid, signo) < 0) r = -errno; if (mode == KILL_CONTROL_GROUP) { |