Merge pull request #11606 from giuseppe/always-move-pause-process-to-scope

runtime: move pause process to scope
This commit is contained in:
OpenShift Merge Robot
2021-09-17 04:35:58 -04:00
committed by GitHub
3 changed files with 46 additions and 42 deletions

View File

@ -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)
}
}