diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-30 21:42:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-30 21:42:47 +0100 |
| commit | 381fa4df875af3d2acee34d4fc1a608b2218b551 (patch) | |
| tree | c8b1820a17b271d786a86380685b96d6276b8b50 /libpod/oci_conmon_linux.go | |
| parent | 45e0bd3891f96aed251cc3bbc99b3d16bfc7b8ab (diff) | |
| parent | 78e2a31943ddab6efcbc14388532dfb410780299 (diff) | |
| download | podman-381fa4df875af3d2acee34d4fc1a608b2218b551.tar.gz podman-381fa4df875af3d2acee34d4fc1a608b2218b551.tar.bz2 podman-381fa4df875af3d2acee34d4fc1a608b2218b551.zip | |
Merge pull request #4380 from giuseppe/rootless-create-cgroup-for-conmon
libpod, rootless: create cgroup for conmon
Diffstat (limited to 'libpod/oci_conmon_linux.go')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 2798c3043..d9907c5b1 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 { |