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-3.0.0.beta1~55^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2129%2Fhead;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 594b00094..f935f8f21 100644
--- a/src/lxc/lxc_init.c
+++ b/src/lxc/lxc_init.c
@@ -408,7 +408,7 @@ int main(int argc, char *argv[])
 			if (mypid != 1) {
 				kill_children(mypid);
 			} else {
-				ret = kill(-1, SIGTERM);
+				ret = kill(-1, SIGKILL);
 				if (ret < 0)
 					DEBUG("%s - Failed to send SIGTERM to "
 					      "all children", strerror(errno));