File 0010-machine_kill-Don-t-kill-the-unit-when-kill... of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch of Package systemd (Revision ef087fefdddf0ce9e9ab390187be3f42)

Currently displaying revision ef087fefdddf0ce9e9ab390187be3f42 , Show latest

From 9d685ca8193c0da3ad5746be3871f5350179a3b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Aug 2014 19:59:16 +0200
Subject: [PATCH] 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.
---
 src/machine/machine.c |    2 ++
 1 file changed, 2 insertions(+)

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

Places

File 0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch of Package systemd (Revision ef087fefdddf0ce9e9ab390187be3f42)

Places