diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-29 17:12:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 17:12:40 +0200 |
| commit | aed91ce3bf9f603375bb675dbd4978147371ff9e (patch) | |
| tree | 2a32fa28b91d9d89d66005fc35de5eb7ba4bd859 /libpod | |
| parent | 8649dbdc11bc14feb59794d76ba197771d8a6d51 (diff) | |
| parent | 153503e3916accf3da27c4893a37ea94731ac2c7 (diff) | |
| download | podman-aed91ce3bf9f603375bb675dbd4978147371ff9e.tar.gz podman-aed91ce3bf9f603375bb675dbd4978147371ff9e.tar.bz2 podman-aed91ce3bf9f603375bb675dbd4978147371ff9e.zip | |
Merge pull request #3188 from giuseppe/fix-join-existing-containers
rootless: new function to join existing conmon processes
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 c7758055f..cba8bdb1a 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -167,7 +167,7 @@ func (r *Runtime) newContainer(ctx context.Context, rSpec *spec.Spec, options .. }() if rootless.IsRootless() && ctr.config.ConmonPidFile == "" { - ctr.config.ConmonPidFile = filepath.Join(ctr.config.StaticDir, "conmon.pid") + ctr.config.ConmonPidFile = filepath.Join(ctr.state.RunDir, "conmon.pid") } // Go through named volumes and add them. |