diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-17 04:35:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 04:35:58 -0400 |
| commit | 84c61b7d36eef804d53f4aabf9aa6866017d2a2c (patch) | |
| tree | 28baae9ad5428b805f69c030526bc3704c6597e4 /libpod/runtime.go | |
| parent | 6cf13c3dbf05a263c08c3f1b1a10cfed722e5929 (diff) | |
| parent | a2c8b5d9d6d6e46679fe9540619d4303d4b4601d (diff) | |
| download | podman-84c61b7d36eef804d53f4aabf9aa6866017d2a2c.tar.gz podman-84c61b7d36eef804d53f4aabf9aa6866017d2a2c.tar.bz2 podman-84c61b7d36eef804d53f4aabf9aa6866017d2a2c.zip | |
Merge pull request #11606 from giuseppe/always-move-pause-process-to-scope
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 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) } } |