[lxc-devel] [lxc/master] lxc-init: use SIGKILL after alarm timeout

tych0 on Github lxc-bot at linuxcontainers.org
Mon Feb 5 14:16:51 UTC 2018


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 478 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180205/9c066b72/attachment.bin>
-------------- next part --------------
From 60e324aa5b9aa75c41d750f975cd220ec95c854b Mon Sep 17 00:00:00 2001
From: Tycho Andersen <tycho at tycho.ws>
Date: Mon, 5 Feb 2018 14:13:18 +0000
Subject: [PATCH] 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 at tycho.ws>
---
 src/lxc/lxc_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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));


More information about the lxc-devel mailing list