diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-22 17:00:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 17:00:48 +0100 |
| commit | 9f146b1b54736ec1b683e3a7381c85d10b1a66a3 (patch) | |
| tree | dd2ff39128e9aa3ba5bf67c7abc69aa59020f6b7 /cmd | |
| parent | 105a42a2a46529312205cf852fa127627f8915e3 (diff) | |
| parent | 1951ff168a63157fa2f4711fde283edfc4981ed3 (diff) | |
| download | podman-9f146b1b54736ec1b683e3a7381c85d10b1a66a3.tar.gz podman-9f146b1b54736ec1b683e3a7381c85d10b1a66a3.tar.bz2 podman-9f146b1b54736ec1b683e3a7381c85d10b1a66a3.zip | |
Merge pull request #4861 from giuseppe/add-cgroups-disabled-conmon
oci_conmon: do not create a cgroup under systemd
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/common.go | 2 |
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", "", |