summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-25 14:54:28 +0200
committerGitHub <noreply@github.com>2019-06-25 14:54:28 +0200
commit21978c99088c04bcc847eb12f829876708c0b9e2 (patch)
treedcd97566680acc7ae18d6690619baa53e25250d8 /docs
parentd8b18a98791a49f5352d6a849cef7bff136cbb2c (diff)
parent53c3720de940ace048ca888caa3ab50d82b2f178 (diff)
downloadpodman-21978c99088c04bcc847eb12f829876708c0b9e2.tar.gz
podman-21978c99088c04bcc847eb12f829876708c0b9e2.tar.bz2
podman-21978c99088c04bcc847eb12f829876708c0b9e2.zip
Merge pull request #3332 from rhatdan/cgroupmanager
Correctly identify the defaults for cgroup-manager
Diffstat (limited to 'docs')
-rw-r--r--docs/podman.1.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/podman.1.md b/docs/podman.1.md
index c23075718..022514a80 100644
--- a/docs/podman.1.md
+++ b/docs/podman.1.md
@@ -27,7 +27,10 @@ Print usage statement
**--cgroup-manager**=*manager*
-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.
+CGroup manager to use for container cgroups. Supported values are cgroupfs or systemd. Default is systemd unless overridden in the libpod.conf file.
+
+Note: Setting this flag can cause certain commands to break when called on containers previously created by the other CGroup manager type.
+Note: CGroup manager is not supported in rootless mode when using CGroups Version V1.
**--cpu-profile**=*path*