diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-21 16:53:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 16:53:53 -0400 |
| commit | 1ad978a3d7dabbf1952fe7ecefe444deb7c8d8f5 (patch) | |
| tree | 866af472bdba64c36c8527bcba6101e49a6137da /cmd/podman/common/create.go | |
| parent | ce07f1cde8315e367da99c843609ff1a52a27f9d (diff) | |
| parent | bc56236102990c6719b7d185bc13c7c70240d211 (diff) | |
| download | podman-1ad978a3d7dabbf1952fe7ecefe444deb7c8d8f5.tar.gz podman-1ad978a3d7dabbf1952fe7ecefe444deb7c8d8f5.tar.bz2 podman-1ad978a3d7dabbf1952fe7ecefe444deb7c8d8f5.zip | |
Merge pull request #5919 from rhatdan/v2
Lots more fixes for V2 conversion.
Diffstat (limited to 'cmd/podman/common/create.go')
| -rw-r--r-- | cmd/podman/common/create.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index f256d9677..bdf762ed7 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -55,7 +55,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { "cgroup namespace to use", ) createFlags.StringVar( - &cf.CGroups, + &cf.CGroupsMode, "cgroups", containerConfig.Cgroups(), `control container cgroup configuration ("enabled"|"disabled"|"no-conmon")`, ) @@ -125,7 +125,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { "Override the key sequence for detaching a container. Format is a single character `[a-Z]` or a comma separated sequence of `ctrl-<value>`, where `<value>` is one of: `a-cf`, `@`, `^`, `[`, `\\`, `]`, `^` or `_`", ) createFlags.StringSliceVar( - &cf.Device, + &cf.Devices, "device", containerConfig.Devices(), fmt.Sprintf("Add a host device to the container"), ) |