From df8b7db3aeac7636345bf7f662e76c32b8824d08 Mon Sep 17 00:00:00 2001 From: fupan Date: Thu, 6 Dec 2018 10:44:42 +0800 Subject: [PATCH] shimv2: fix the issue of reaping child mistakenly For kata shimv2, the sub-reaper isn't needed, otherwise it will break the cmd.Run() calling in govmmQemu.LaunchQemu(). Fixes: #939 Signed-off-by: fupan --- cli/containerd-shim-kata-v2/main.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cli/containerd-shim-kata-v2/main.go b/cli/containerd-shim-kata-v2/main.go index dadd4cde6..03ce932ee 100644 --- a/cli/containerd-shim-kata-v2/main.go +++ b/cli/containerd-shim-kata-v2/main.go @@ -10,6 +10,11 @@ import ( "github.com/kata-containers/runtime/containerd-shim-v2" ) -func main() { - shim.Run("io.containerd.kata.v2", containerdshim.New) +func shimConfig(config *shim.Config) { + config.NoReaper = true + config.NoSubreaper = true +} + +func main() { + shim.Run("io.containerd.kata.v2", containerdshim.New, shimConfig) }