summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2021-09-16 12:46:21 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2021-09-16 20:17:40 +0200
commita2c8b5d9d6d6e46679fe9540619d4303d4b4601d (patch)
tree223cc861f5ff22dbb698bb825911911ab7bb36e6
parent72534a74b3c2ff35ae1711a890406a6bce5fa44f (diff)
downloadpodman-a2c8b5d9d6d6e46679fe9540619d4303d4b4601d.tar.gz
podman-a2c8b5d9d6d6e46679fe9540619d4303d4b4601d.tar.bz2
podman-a2c8b5d9d6d6e46679fe9540619d4303d4b4601d.zip
runtime: move pause process to scope
make sure the pause process is moved to its own scope as well as what we do when we join an existing user+mount namespace. Closes: https://github.com/containers/podman/issues/11560 [NO TESTS NEEDED] Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--libpod/runtime.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go
index d2b3d36da..a2279e56d 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -35,6 +35,7 @@ import (
"github.com/containers/podman/v3/pkg/rootless"
"github.com/containers/podman/v3/pkg/systemd"
"github.com/containers/podman/v3/pkg/util"
+ "github.com/containers/podman/v3/utils"
"github.com/containers/storage"
"github.com/containers/storage/pkg/unshare"
"github.com/docker/docker/pkg/namesgenerator"
@@ -543,6 +544,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
return err
}
if became {
+ utils.MovePauseProcessToScope(pausePid)
os.Exit(ret)
}
}