diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-10-30 16:53:38 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-10-30 17:04:05 +0100 |
| commit | 78e2a31943ddab6efcbc14388532dfb410780299 (patch) | |
| tree | 53bfb50b512cda73b4a0db64ab1e254964d8594c /libpod | |
| parent | e7540d0406c49b22de245246d16ebc6e1778df37 (diff) | |
| download | podman-78e2a31943ddab6efcbc14388532dfb410780299.tar.gz podman-78e2a31943ddab6efcbc14388532dfb410780299.tar.bz2 podman-78e2a31943ddab6efcbc14388532dfb410780299.zip | |
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 <gscrivan@redhat.com>
Diffstat (limited to 'libpod')
| -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 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 { |