From f65eafa6ba2fec491185ccf29a515c9a96b9852a Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 19 Dec 2018 18:06:12 +0100 Subject: libpod: always store the conmon pid file we need this information to later be able to join the conmon process. Signed-off-by: Giuseppe Scrivano --- libpod/runtime_ctr.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libpod') diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index ba8eaacbe..c108febd7 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -8,6 +8,7 @@ import ( "strings" "time" + "github.com/containers/libpod/pkg/rootless" "github.com/containers/storage" "github.com/containers/storage/pkg/stringid" spec "github.com/opencontainers/runtime-spec/specs-go" @@ -154,6 +155,10 @@ 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") + } + // Go through the volume mounts and check for named volumes // If the named volme already exists continue, otherwise create // the storage for the named volume. -- cgit v1.2.3-54-g00ecf