summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2019-05-24 09:06:22 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-05-25 13:47:59 +0200
commitc4dedd302182fa44492baf7b0f9da3f148a08ae4 (patch)
treeb4c7a46d3d8c5484e7956a44f561b8e0ae1526dc
parent30ef6ba125536077923f19ed079b321f264ede99 (diff)
downloadpodman-c4dedd302182fa44492baf7b0f9da3f148a08ae4.tar.gz
podman-c4dedd302182fa44492baf7b0f9da3f148a08ae4.tar.bz2
podman-c4dedd302182fa44492baf7b0f9da3f148a08ae4.zip
Revert "rootless: change default path for conmon.pid"
since we now enter the user namespace prior to read the conmon.pid, we can write the conmon.pid file again to the runtime dir. This reverts commit 6c6a8654363457a9638d58265d0a7e8743575d7a. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-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 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.