diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-09-16 12:08:30 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-09-17 10:37:55 +0200 |
| commit | 34c9ce2ec91ac1ada9de0cc644f8870aaf190889 (patch) | |
| tree | ef499099a085bfb0aad737ebb8df2945f7756bf0 | |
| parent | d6884dedc3386c7fa07018241d01e86c527bbe3f (diff) | |
| download | podman-34c9ce2ec91ac1ada9de0cc644f8870aaf190889.tar.gz podman-34c9ce2ec91ac1ada9de0cc644f8870aaf190889.tar.bz2 podman-34c9ce2ec91ac1ada9de0cc644f8870aaf190889.zip | |
system: avoid reading pause pid file
we already know the path to the pause PID file, no need to calculate
it again.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit fa9728c5509f1ef3bb1c80055e89b910d9740efd)
| -rw-r--r-- | pkg/domain/infra/abi/system.go | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go index bc98edd06..0f7492354 100644 --- a/pkg/domain/infra/abi/system.go +++ b/pkg/domain/infra/abi/system.go @@ -12,7 +12,6 @@ import ( "strings" "github.com/containers/common/pkg/config" - "github.com/containers/podman/v3/libpod" "github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/pkg/cgroups" "github.com/containers/podman/v3/pkg/domain/entities" @@ -121,7 +120,7 @@ func (ic *ContainerEngine) SetupRootless(_ context.Context, noMoveProcess bool) became, ret, err = rootless.TryJoinFromFilePaths(pausePidPath, true, paths) - if err := movePauseProcessToScope(ic.Libpod); err != nil { + if err := movePauseProcessToScope(pausePidPath); err != nil { conf, err2 := ic.Config(context.Background()) if err2 != nil { return err @@ -142,15 +141,7 @@ func (ic *ContainerEngine) SetupRootless(_ context.Context, noMoveProcess bool) return nil } -func movePauseProcessToScope(r *libpod.Runtime) error { - tmpDir, err := r.TmpDir() - if err != nil { - return err - } - pausePidPath, err := util.GetRootlessPauseProcessPidPathGivenDir(tmpDir) - if err != nil { - return errors.Wrapf(err, "could not get pause process pid file path") - } +func movePauseProcessToScope(pausePidPath string) error { data, err := ioutil.ReadFile(pausePidPath) if err != nil { return errors.Wrapf(err, "cannot read pause pid file") |