diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-15 10:46:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 10:46:33 -0400 |
| commit | c0cde378298bd8d5183155c8f62aae574be069eb (patch) | |
| tree | 81d83de3be64cad8eefc0a56391d06ca5c71f253 /libpod | |
| parent | 81f41ca0d2a0acd9896bb60b1096baa236725dec (diff) | |
| parent | 44abc17977165ceb6b7d84efe4b9c62c8fbb2ac1 (diff) | |
| download | podman-c0cde378298bd8d5183155c8f62aae574be069eb.tar.gz podman-c0cde378298bd8d5183155c8f62aae574be069eb.tar.bz2 podman-c0cde378298bd8d5183155c8f62aae574be069eb.zip | |
Merge pull request #11567 from giuseppe/cgroups-split-with-pods
libpod: honor --cgroups=split also with pods
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_internal_linux.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index ae029dc62..4194a0d93 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -2490,9 +2490,6 @@ func (c *Container) getOCICgroupPath() (string, error) { case c.config.NoCgroups: return "", nil case c.config.CgroupsMode == cgroupSplit: - if c.config.CgroupParent != "" { - return c.config.CgroupParent, nil - } selfCgroup, err := utils.GetOwnCgroup() if err != nil { return "", err |