summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-08-14 19:59:16 +0200
committerLennart Poettering <lennart@poettering.net>2014-08-14 20:10:33 +0200
commit9d685ca8193c0da3ad5746be3871f5350179a3b3 (patch)
treefbc8f48e4e54f90f2e540795fb53c2c16b1f5328
parent5ba73e9b646af4d8109a5a633aa235665858144d (diff)
machine_kill(): Don't kill the unit when killing the leader
If "machinectl poweroff" or "machinectl reboot" is used on a systemd-nspawn container started with --keep-unit and --register, it should *only* send the appropriate signal to the leader PID (i.e. the container's systemd process). It shouldn't fall through to manager_kill_unit() to also send the signal to the unit. The latter ends up killing systemd-nspawn, which takes down the container prematurely.
-rw-r--r--src/machine/machine.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/machine/machine.c b/src/machine/machine.c
index 1c9177e1c3..13d3448adf 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -493,6 +493,8 @@ int machine_kill(Machine *m, KillWho who, int signo) {
if (kill(m->leader, signo) < 0)
return -errno;
+
+ return 0;
}
/* Otherwise make PID 1 do it for us, for the entire cgroup */