From 37b134054e768317415f1ee0156a422b98656f24 Mon Sep 17 00:00:00 2001 From: Danila Kiver Date: Thu, 4 Jul 2019 21:08:06 +0300 Subject: 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 --- libpod/runtime_ctr.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libpod/runtime_ctr.go') 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") } -- cgit v1.2.3-54-g00ecf