diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-03-21 12:19:26 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-05-11 14:43:57 +0000 |
| commit | 853c5c41f1a0f65815674cce0777a20de24c8309 (patch) | |
| tree | 76d7c1569b1a08f2b0b738c9a96e7f8fceb4b254 /cmd/podman | |
| parent | df83d361e4fe3c1fc1939b096cb21aa2e7ec3d74 (diff) | |
| download | podman-853c5c41f1a0f65815674cce0777a20de24c8309.tar.gz podman-853c5c41f1a0f65815674cce0777a20de24c8309.tar.bz2 podman-853c5c41f1a0f65815674cce0777a20de24c8309.zip | |
Add --cgroup-manager flag to Podman binary
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #507
Approved by: baude
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/libpodruntime/runtime.go | 5 | ||||
| -rw-r--r-- | cmd/podman/main.go | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go index d1657325d..ea626ed8e 100644 --- a/cmd/podman/libpodruntime/runtime.go +++ b/cmd/podman/libpodruntime/runtime.go @@ -42,7 +42,10 @@ func GetRuntimeWithStorageOpts(c *cli.Context, storageOpts *storage.StoreOptions options = append(options, libpod.WithConmonPath(c.GlobalString("conmon"))) } - // TODO flag to set CGroup manager? + if c.GlobalIsSet("cgroup-manager") { + options = append(options, libpod.WithCgroupManager(c.GlobalString("cgroup-manager"))) + } + // TODO flag to set libpod static dir? // TODO flag to set libpod tmp dir? diff --git a/cmd/podman/main.go b/cmd/podman/main.go index aefde3b93..c928037e3 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -109,6 +109,10 @@ func main() { } app.Flags = []cli.Flag{ cli.StringFlag{ + Name: "cgroup-manager", + Usage: "cgroup manager to use (cgroupfs or systemd, default cgroupfs)", + }, + cli.StringFlag{ Name: "cni-config-dir", Usage: "path of the configuration directory for CNI networks", }, |