summaryrefslogtreecommitdiff
path: root/src/mount.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-03-29 23:31:38 +0200
committerLennart Poettering <lennart@poettering.net>2011-03-29 23:31:38 +0200
commitcd25cce98f5cc930202212c3c9c13605c09698b4 (patch)
tree7c186394fed8a04e5ad8fef37eda670282f2a08e /src/mount.c
parent12235040ec94279ad92693dcfae0a4d9c35a6076 (diff)
exec: drop process group kill mode since it has little use and confuses the user
Diffstat (limited to 'src/mount.c')
-rw-r--r--src/mount.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mount.c b/src/mount.c
index cc49b1993f..8528d17a80 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -747,9 +747,7 @@ static void mount_enter_signal(Mount *m, MountState state, bool success) {
state == MOUNT_REMOUNTING_SIGTERM) ? m->exec_context.kill_signal : SIGKILL;
if (m->control_pid > 0) {
- if (kill_and_sigcont(m->exec_context.kill_mode == KILL_PROCESS_GROUP ?
- -m->control_pid :
- m->control_pid, sig) < 0 && errno != ESRCH)
+ if (kill_and_sigcont(m->control_pid, sig) < 0 && errno != ESRCH)
log_warning("Failed to kill control process %li: %m", (long) m->control_pid);
else
@@ -1684,7 +1682,7 @@ static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
}
if (m->control_pid > 0)
- if (kill(mode == KILL_PROCESS_GROUP ? -m->control_pid : m->control_pid, signo) < 0)
+ if (kill(m->control_pid, signo) < 0)
r = -errno;
if (mode == KILL_CONTROL_GROUP) {