summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2018-02-09 11:56:39 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-02-09 20:11:07 +0000
commitb07c8d6a734577318a4f147be8acd35a6deb54ae (patch)
tree462200de9746b1382999b840883385fc22c46183 /libpod
parent4ea26aace4d7fff52c52b438bd6df03645834b4f (diff)
downloadpodman-b07c8d6a734577318a4f147be8acd35a6deb54ae.tar.gz
podman-b07c8d6a734577318a4f147be8acd35a6deb54ae.tar.bz2
podman-b07c8d6a734577318a4f147be8acd35a6deb54ae.zip
Fix libpod to use given CGroup parent instead of a hardcoded one
Signed-off-by: Matthew Heon <mheon@redhat.com> Closes: #319 Approved by: TomSweeneyRedHat
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_api.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go
index 72df60eb8..6fdc45589 100644
--- a/libpod/container_api.go
+++ b/libpod/container_api.go
@@ -285,8 +285,7 @@ func (c *Container) Init() (err error) {
c.state.ConfigPath = jsonPath
// With the spec complete, do an OCI create
- // TODO set cgroup parent in a sane fashion
- if err := c.runtime.ociRuntime.createContainer(c, CgroupParent); err != nil {
+ if err := c.runtime.ociRuntime.createContainer(c, c.config.CgroupParent); err != nil {
return err
}