diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-09-16 12:46:21 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-09-17 10:38:02 +0200 |
| commit | 40eeb7d3ba1186056df326349be984920c55dc1b (patch) | |
| tree | a4fef7eacd80d945bb7512e4b4f21954aa492743 | |
| parent | e6fe5d6312e1569b688baeb1aa1cee3030921076 (diff) | |
| download | podman-40eeb7d3ba1186056df326349be984920c55dc1b.tar.gz podman-40eeb7d3ba1186056df326349be984920c55dc1b.tar.bz2 podman-40eeb7d3ba1186056df326349be984920c55dc1b.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>
(cherry picked from commit a2c8b5d9d6d6e46679fe9540619d4303d4b4601d)
| -rw-r--r-- | libpod/runtime.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 761fa08a2..c22d87324 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -34,6 +34,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/cri-o/ocicni/pkg/ocicni" @@ -540,6 +541,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) { return err } if became { + utils.MovePauseProcessToScope(pausePid) os.Exit(ret) } } |