diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-09-20 14:17:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 14:17:56 -0400 |
| commit | f93500810800e85af4de88b99efeaea989db9025 (patch) | |
| tree | a12daf6fea64b6355b0ac19b2de72c5e7996ae14 /libpod/runtime.go | |
| parent | cd09903eff3589d82256a86e144f4a4c5bedccbe (diff) | |
| parent | 331ce0f7ee2736d5f012ea6a6d2aba77213e3956 (diff) | |
| download | podman-f93500810800e85af4de88b99efeaea989db9025.tar.gz podman-f93500810800e85af4de88b99efeaea989db9025.tar.bz2 podman-f93500810800e85af4de88b99efeaea989db9025.zip | |
Merge pull request #11624 from giuseppe/3.4-fix-pause-process
[3.4] runtime: move pause process to scope
Diffstat (limited to 'libpod/runtime.go')
| -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) } } |