The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/2129
This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) === 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 <ty...@tycho.ws>
From 60e324aa5b9aa75c41d750f975cd220ec95c854b Mon Sep 17 00:00:00 2001 From: Tycho Andersen <ty...@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 <ty...@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));
_______________________________________________ lxc-devel mailing list lxc-devel@lists.linuxcontainers.org http://lists.linuxcontainers.org/listinfo/lxc-devel