summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorDanila Kiver <danila.kiver@mail.ru>2019-07-04 21:08:06 +0300
committerDanila Kiver <danila.kiver@mail.ru>2019-07-04 21:08:06 +0300
commit37b134054e768317415f1ee0156a422b98656f24 (patch)
tree7d7ccdf20d17eb53bb94dffbf42e2d08a46db6ec /libpod
parenta54429cf877e899eb1516e3ee71ae9c6eedd7c5a (diff)
downloadpodman-37b134054e768317415f1ee0156a422b98656f24.tar.gz
podman-37b134054e768317415f1ee0156a422b98656f24.tar.bz2
podman-37b134054e768317415f1ee0156a422b98656f24.zip
Use default conmon pidfile location for root containers.
The conmon pidfile is crucial for podman-generated systemd units, because these units rely on it for determining service's main process ID. With this change, every container has ConmonPidFile set (at least to default value). Signed-off-by: Danila Kiver <danila.kiver@mail.ru>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/runtime_ctr.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
index 9daac161c..683969118 100644
--- a/libpod/runtime_ctr.go
+++ b/libpod/runtime_ctr.go
@@ -236,7 +236,7 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container, restore bo
}
}()
- if rootless.IsRootless() && ctr.config.ConmonPidFile == "" {
+ if ctr.config.ConmonPidFile == "" {
ctr.config.ConmonPidFile = filepath.Join(ctr.state.RunDir, "conmon.pid")
}