From: Tycho Andersen <tycho@tycho.ws>
Date: Mon, 5 Feb 2018 14:13:18 +0000 (+0000)
Subject: lxc-init: use SIGKILL after alarm timeout
X-Git-Tag: lxc-2.0.10~363
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ba824d28c28c0f3509ac8f2eaf988fb81884ee3;p=thirdparty%2Flxc.git

lxc-init: use SIGKILL after alarm timeout

d76e3e1 inadvertently switched the alarm timeout from sigterm to sigkill.
We really want sigkill here, so let's bring it back.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>
---

diff --git a/src/lxc/lxc_init.c b/src/lxc/lxc_init.c
index 19f6bb352..c20dfbb3f 100644
--- a/src/lxc/lxc_init.c
+++ b/src/lxc/lxc_init.c
@@ -401,7 +401,7 @@ int main(int argc, char *argv[])
 			if (lxc_raw_getpid() != 1) {
 				kill_children(lxc_raw_getpid());
 			} else {
-				ret = kill(-1, SIGTERM);
+				ret = kill(-1, SIGKILL);
 				if (ret < 0)
 					DEBUG("%s - Failed to send SIGTERM to "
 					      "all children", strerror(errno));