summaryrefslogtreecommitdiff
path: root/cmd/podman/common.go
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2020-01-14 15:05:12 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2020-01-16 18:56:51 +0100
commitba0a6f34e349bfb5cf70cb2062522e6af1b9578c (patch)
treeb74d4b895ac5b39d4b1f6448aab2fd8c7ac7dbcc /cmd/podman/common.go
parent30245affe9881fdedc869ccb68faa3e2f5fb9366 (diff)
downloadpodman-ba0a6f34e349bfb5cf70cb2062522e6af1b9578c.tar.gz
podman-ba0a6f34e349bfb5cf70cb2062522e6af1b9578c.tar.bz2
podman-ba0a6f34e349bfb5cf70cb2062522e6af1b9578c.zip
podman: add new option --cgroups=no-conmon
it allows to disable cgroups creation only for the conmon process. A new cgroup is created for the container payload. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'cmd/podman/common.go')
-rw-r--r--cmd/podman/common.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 8690be64f..f3aff1d49 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -158,7 +158,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) {
)
createFlags.String(
"cgroups", "enabled",
- "control container cgroup configuration",
+ `control container cgroup configuration ("enabled"|"disabled"|"no-conmon")`,
)
createFlags.String(
"cgroup-parent", "",