From 78e2a31943ddab6efcbc14388532dfb410780299 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 30 Oct 2019 16:53:38 +0100 Subject: libpod, rootless: create cgroup for conmon always create a new cgroup for conmon also when running as rootless. We were previously creating one only when necessary, but that behaves differently than root containers. Signed-off-by: Giuseppe Scrivano --- libpod/oci_conmon_linux.go | 8 -------- 1 file changed, 8 deletions(-) (limited to 'libpod/oci_conmon_linux.go') diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 448e05bdf..12b545048 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -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 { -- cgit v1.2.3-54-g00ecf