diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-08 23:39:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-08 23:39:42 +0200 |
| commit | fce2e6577e8a6be153c45f4d732fb0fcc3c95a4a (patch) | |
| tree | 62a3d6ec343bba742e159a5514e8a64e6e8baf99 /libpod/runtime_ctr.go | |
| parent | 8d37c2073f774d7f7e708cdb8c24f07c87e83587 (diff) | |
| parent | 2bfade4391bb6d247ddab2d129d0529471c17063 (diff) | |
| download | podman-fce2e6577e8a6be153c45f4d732fb0fcc3c95a4a.tar.gz podman-fce2e6577e8a6be153c45f4d732fb0fcc3c95a4a.tar.bz2 podman-fce2e6577e8a6be153c45f4d732fb0fcc3c95a4a.zip | |
Merge pull request #3497 from QazerLab/bugfix/systemd-generate-pidfile
Use conmon pidfile in generated systemd unit as PIDFile.
Diffstat (limited to 'libpod/runtime_ctr.go')
| -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 633d26fe1..ae9b3e5bc 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -237,7 +237,7 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (c *Contai } }() - if rootless.IsRootless() && ctr.config.ConmonPidFile == "" { + if ctr.config.ConmonPidFile == "" { ctr.config.ConmonPidFile = filepath.Join(ctr.state.RunDir, "conmon.pid") } |