summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/libpodruntime/runtime.go5
-rw-r--r--cmd/podman/main.go4
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",
},