diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-16 03:45:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 03:45:30 -0700 |
| commit | 2c727eef836a6c0342bc46202d2712572a3ea40b (patch) | |
| tree | ed01e3c27d6c624532b0d4d14077f4df40e26d39 /libpod | |
| parent | 3754f58499ad17386d8faa7c2fab1d9cc8231923 (diff) | |
| parent | 6c6a8654363457a9638d58265d0a7e8743575d7a (diff) | |
| download | podman-2c727eef836a6c0342bc46202d2712572a3ea40b.tar.gz podman-2c727eef836a6c0342bc46202d2712572a3ea40b.tar.bz2 podman-2c727eef836a6c0342bc46202d2712572a3ea40b.zip | |
Merge pull request #2675 from giuseppe/rootless-use-readable-path-for-conmon
rootless: change default path for conmon.pid
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/runtime_ctr.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index c6f119913..3b74a65dd 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -171,7 +171,7 @@ func (r *Runtime) newContainer(ctx context.Context, rSpec *spec.Spec, options .. }() if rootless.IsRootless() && ctr.config.ConmonPidFile == "" { - ctr.config.ConmonPidFile = filepath.Join(ctr.state.RunDir, "conmon.pid") + ctr.config.ConmonPidFile = filepath.Join(ctr.config.StaticDir, "conmon.pid") } // Go through the volume mounts and check for named volumes |