]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
lxc-init: use SIGKILL after alarm timeout
authorTycho Andersen <tycho@tycho.ws>
Mon, 5 Feb 2018 14:13:18 +0000 (14:13 +0000)
committerChristian Brauner <christian.brauner@ubuntu.com>
Tue, 6 Feb 2018 12:36:48 +0000 (13:36 +0100)
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>
src/lxc/lxc_init.c

index 19f6bb352cdfcf089959a0f2b0c4716ab2a8af09..c20dfbb3fe6d4decfc87c974936bce8a2b98c35b 100644 (file)
@@ -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));