containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 6c6a865436.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2019-05-24 09:06:22 +02:00
parent 30ef6ba125
commit c4dedd3021
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/runtime_ctr.go
View File

@ -167,7 +167,7 @@ func (r *Runtime) newContainer(ctx context.Context, rSpec *spec.Spec, options ..
}() }()
if rootless.IsRootless() && ctr.config.ConmonPidFile == "" { 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. // Go through named volumes and add them.