diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-07 17:28:28 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-07 17:28:28 -0500 |
commit | 23d2deed30c2491a2cf59644324f27c9eebf7ba4 (patch) | |
tree | e191f6ea97f53e22f9b43e04900fe9df1e65eef9 /libpod/runtime_migrate.go | |
parent | 4c424e845239aef6e8cdab93dc19f55f4314513c (diff) | |
parent | 33bde4569ccb65b447150894c56f9a351a09a471 (diff) | |
download | podman-23d2deed30c2491a2cf59644324f27c9eebf7ba4.tar.gz podman-23d2deed30c2491a2cf59644324f27c9eebf7ba4.tar.bz2 podman-23d2deed30c2491a2cf59644324f27c9eebf7ba4.zip |
Merge pull request #8640 from mheon/221_backports
Backports for v2.2.1
Diffstat (limited to 'libpod/runtime_migrate.go')
-rw-r--r-- | libpod/runtime_migrate.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/runtime_migrate.go b/libpod/runtime_migrate.go index 1ad32fe9c..f0f800ef0 100644 --- a/libpod/runtime_migrate.go +++ b/libpod/runtime_migrate.go @@ -18,9 +18,9 @@ import ( "github.com/sirupsen/logrus" ) -func stopPauseProcess() error { +func (r *Runtime) stopPauseProcess() error { if rootless.IsRootless() { - pausePidPath, err := util.GetRootlessPauseProcessPidPath() + pausePidPath, err := util.GetRootlessPauseProcessPidPathGivenDir(r.config.Engine.TmpDir) if err != nil { return errors.Wrapf(err, "could not get pause process pid file path") } @@ -98,5 +98,5 @@ func (r *Runtime) migrate(ctx context.Context) error { } } - return stopPauseProcess() + return r.stopPauseProcess() } |