diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-01-12 12:01:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 12:01:34 -0500 |
| commit | 6e8100cf2e70c8c6b5a8504298d1e295a288a0b1 (patch) | |
| tree | df3124bb1235b71a0e09b8f6009f1a3bce48f039 /libpod/container.go | |
| parent | 198c91c2ea0c82d0ffc82eba86c31224c69e84bb (diff) | |
| parent | 04e0687da14070ea3ff208687d4f749d5dc319a0 (diff) | |
| download | podman-6e8100cf2e70c8c6b5a8504298d1e295a288a0b1.tar.gz podman-6e8100cf2e70c8c6b5a8504298d1e295a288a0b1.tar.bz2 podman-6e8100cf2e70c8c6b5a8504298d1e295a288a0b1.zip | |
Merge pull request #211 from mheon/wireup_backends
Wire up API for CGroup Parent
Diffstat (limited to 'libpod/container.go')
| -rw-r--r-- | libpod/container.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libpod/container.go b/libpod/container.go index f3dd02cce..dfd77938d 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -82,7 +82,6 @@ type Container struct { // TODO Add readonly support // TODO add SHM size support // TODO add shared namespace support -// TODO add cgroup parent support // containerRuntimeInfo contains the current state of the container // It is stored on disk in a tmpfs and recreated on reboot @@ -1247,7 +1246,7 @@ func (c *Container) cleanupStorage() error { // CGroupPath returns a cgroups "path" for a given container. func (c *Container) CGroupPath() cgroups.Path { - return cgroups.StaticPath(filepath.Join(CgroupParent, fmt.Sprintf("libpod-conmon-%s", c.ID()))) + return cgroups.StaticPath(filepath.Join(c.config.CgroupParent, fmt.Sprintf("libpod-conmon-%s", c.ID()))) } // copyHostFileToRundir copies the provided file to the runtimedir |