Skip to content

Commit

Permalink
Revert "libpod, rootless: create cgroup for conmon"
Browse files Browse the repository at this point in the history
This reverts commit 78e2a31.

Fixes: containers#4833
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
  • Loading branch information
vrothberg committed Jan 10, 2020
1 parent f57fdd0 commit 839ac19
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions libpod/oci_conmon_linux.go
Expand Up @@ -1255,6 +1255,14 @@ 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 == define.SystemdCgroupsManager {
Expand Down

0 comments on commit 839ac19

Please sign in to comment.