erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-08-07 09:25:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #4380 from giuseppe/rootless-create-cgroup-for-conmon

Browse source 
libpod, rootless: create cgroup for conmon
This commit is contained in:
OpenShift Merge Robot 2019-10-30 21:42:47 +01:00 • committed by GitHub
commit 381fa4df87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libpod/oci_conmon_linux.go
View file

@ -1220,14 +1220,6 @@ func (r *ConmonOCIRuntime) moveConmonToCgroupAndSignal(ctr *Container, cmd *exec
mustCreateCgroup = false
}
if rootless.IsRootless() {
ownsCgroup, err := cgroups.UserOwnsCurrentSystemdCgroup()
if err != nil {
return err
}
mustCreateCgroup = !ownsCgroup
}
if mustCreateCgroup {
cgroupParent := ctr.CgroupParent()
if r.cgroupManager == SystemdCgroupsManager {