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_opts.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_opts.go')
| -rw-r--r-- | cmd/podman/common/create_opts.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 9d12e4b26..2f08bb6a6 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -11,7 +11,7 @@ type ContainerCLIOpts struct { CapAdd []string CapDrop []string CGroupsNS string - CGroups string + CGroupsMode string CGroupParent string CIDFile string ConmonPIDFile string @@ -25,7 +25,7 @@ type ContainerCLIOpts struct { CPUSetMems string Detach bool DetachKeys string - Device []string + Devices []string DeviceCGroupRule []string DeviceReadBPs []string DeviceReadIOPs []string |