From 76915d5ffd10a1b9a88bcf44808729ae0d9bc3cf Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Fri, 17 Aug 2018 14:04:23 -0400 Subject: Mention that systemd is the default cgroup manager Update docs to reflect our changed default CGroup manager. Fixes: #1292 Signed-off-by: Matthew Heon Closes: #1293 Approved by: baude --- cmd/podman/main.go | 2 +- docs/podman.1.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/podman/main.go b/cmd/podman/main.go index e72998c8f..053049266 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -144,7 +144,7 @@ func main() { app.Flags = []cli.Flag{ cli.StringFlag{ Name: "cgroup-manager", - Usage: "cgroup manager to use (cgroupfs or systemd, default cgroupfs)", + Usage: "cgroup manager to use (cgroupfs or systemd, default systemd)", }, cli.StringFlag{ Name: "cni-config-dir", diff --git a/docs/podman.1.md b/docs/podman.1.md index 26a5a0ae0..186a7047e 100644 --- a/docs/podman.1.md +++ b/docs/podman.1.md @@ -25,7 +25,7 @@ Print usage statement **--cgroup-manager** -CGroup manager to use for container cgroups. Supported values are cgroupfs (default) or systemd. Setting this flag can cause certain commands to break when called on containers created by the other CGroup manager type. +CGroup manager to use for container cgroups. Supported values are cgroupfs or systemd (default). Setting this flag can cause certain commands to break when called on containers created by the other CGroup manager type. **--config value, -c**=**"config.file"** -- cgit v1.2.3-54-g00ecf