diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-02 22:03:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 22:03:19 +0100 |
| commit | 7984842d7e55baa8fc9498afa23b62113850feac (patch) | |
| tree | 45a9d09c0595ee11b7162c11836004b51a2c2aa4 /libpod/runtime_migrate.go | |
| parent | e74072e742a427fbd8577fdc98daf1133cf13c48 (diff) | |
| parent | ab886328357184cd0a8375a5dedf816ba91789f9 (diff) | |
| download | podman-7984842d7e55baa8fc9498afa23b62113850feac.tar.gz podman-7984842d7e55baa8fc9498afa23b62113850feac.tar.bz2 podman-7984842d7e55baa8fc9498afa23b62113850feac.zip | |
Merge pull request #8556 from mheon/fix_8539
Use Libpod tmpdir for pause path
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() } |