diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-17 14:00:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 14:00:09 +0100 |
| commit | 42ec4cf87f8d0a84301594a4fc5cf05f0a10bd7f (patch) | |
| tree | 44cdc92a9a1789f957f2dc177dfcd90f4138eb96 /libpod/container_internal_linux.go | |
| parent | 7d067afac716927b26c452d4d75478b9f13abd62 (diff) | |
| parent | 39bf07694c5716cce3cb7e25c6d01b441b6b4e01 (diff) | |
| download | podman-42ec4cf87f8d0a84301594a4fc5cf05f0a10bd7f.tar.gz podman-42ec4cf87f8d0a84301594a4fc5cf05f0a10bd7f.tar.bz2 podman-42ec4cf87f8d0a84301594a4fc5cf05f0a10bd7f.zip | |
Merge pull request #8290 from vrothberg/fix-8265
use container cgroups path
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 7b21e284b..b81f3f716 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -2096,10 +2096,7 @@ func (c *Container) getOCICgroupPath() (string, error) { logrus.Debugf("Setting CGroups for container %s to %s", c.ID(), systemdCgroups) return systemdCgroups, nil case cgroupManager == config.CgroupfsCgroupsManager: - cgroupPath, err := c.CGroupPath() - if err != nil { - return "", err - } + cgroupPath := filepath.Join(c.config.CgroupParent, fmt.Sprintf("libpod-%s", c.ID())) logrus.Debugf("Setting CGroup path for container %s to %s", c.ID(), cgroupPath) return cgroupPath, nil default: |