diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-08 18:08:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-08 18:08:17 -0400 |
| commit | e9961e053cab35abffc575fb9cbd6e7c4e79a324 (patch) | |
| tree | 8e03e7233a4bfb8f69577c34fb8cd8d6ac9fc3ae /libpod/container_inspect.go | |
| parent | c61faacc78e916fdfa9f53bb543514e11138903c (diff) | |
| parent | 4d800a5f45abba9c17d4b3a4c04af563c9a2f4da (diff) | |
| download | podman-e9961e053cab35abffc575fb9cbd6e7c4e79a324.tar.gz podman-e9961e053cab35abffc575fb9cbd6e7c4e79a324.tar.bz2 podman-e9961e053cab35abffc575fb9cbd6e7c4e79a324.zip | |
Merge pull request #7970 from mheon/fix_7830
Store cgroup manager on a per-container basis
Diffstat (limited to 'libpod/container_inspect.go')
| -rw-r--r-- | libpod/container_inspect.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index 835dccd71..b8bce1272 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -729,7 +729,7 @@ func (c *Container) generateInspectContainerHostConfig(ctrSpec *spec.Spec, named // CGroup parent // Need to check if it's the default, and not print if so. defaultCgroupParent := "" - switch c.runtime.config.Engine.CgroupManager { + switch c.CgroupManager() { case config.CgroupfsCgroupsManager: defaultCgroupParent = CgroupfsDefaultCgroupParent case config.SystemdCgroupsManager: @@ -738,6 +738,7 @@ func (c *Container) generateInspectContainerHostConfig(ctrSpec *spec.Spec, named if c.config.CgroupParent != defaultCgroupParent { hostConfig.CgroupParent = c.config.CgroupParent } + hostConfig.CgroupManager = c.CgroupManager() // PID namespace mode pidMode := "" |