diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-08-17 14:04:23 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-17 18:27:46 +0000 |
| commit | 76915d5ffd10a1b9a88bcf44808729ae0d9bc3cf (patch) | |
| tree | 55f6738a4d914df7f2de7675c942ec2f75d4772e | |
| parent | 95c7d201428bea6f09ef632f0d3fd59e9b75e85c (diff) | |
| download | podman-76915d5ffd10a1b9a88bcf44808729ae0d9bc3cf.tar.gz podman-76915d5ffd10a1b9a88bcf44808729ae0d9bc3cf.tar.bz2 podman-76915d5ffd10a1b9a88bcf44808729ae0d9bc3cf.zip | |
Mention that systemd is the default cgroup manager
Update docs to reflect our changed default CGroup manager.
Fixes: #1292
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #1293
Approved by: baude
| -rw-r--r-- | cmd/podman/main.go | 2 | ||||
| -rw-r--r-- | 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"** |