[systemd-commits] src/machine

[Lennart Poettering]

 src/machine/machine.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9d685ca8193c0da3ad5746be3871f5350179a3b3
Author: Eelco Dolstra <eelco.dolstra at logicblox.com>
Date:   Thu Aug 14 19:59:16 2014 +0200

    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.

diff --git a/src/machine/machine.c b/src/machine/machine.c
index 1c9177e..13d3448 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 */