diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-23 01:35:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-23 01:35:58 +0200 |
commit | da1f47921685f40f1b26405278cbf9cb2d06fe09 (patch) | |
tree | 598374f4839b1fd171b20704b929af16c199d9b1 /pkg/specgen/generate/container_create.go | |
parent | 935c150ee214e689b8f25c195ecc22af12d1ddc7 (diff) | |
parent | ad8940cecff20426120bc8eabff50e734ad7b765 (diff) | |
download | podman-da1f47921685f40f1b26405278cbf9cb2d06fe09.tar.gz podman-da1f47921685f40f1b26405278cbf9cb2d06fe09.tar.bz2 podman-da1f47921685f40f1b26405278cbf9cb2d06fe09.zip |
Merge pull request #15035 from cdoern/cgroup
fix container create/run throttle devices
Diffstat (limited to 'pkg/specgen/generate/container_create.go')
-rw-r--r-- | pkg/specgen/generate/container_create.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index 389900820..8334d386f 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -55,6 +55,10 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener } } + if err := FinishThrottleDevices(s); err != nil { + return nil, nil, nil, err + } + // Set defaults for unset namespaces if s.PidNS.IsDefault() { defaultNS, err := GetDefaultNamespaceMode("pid", rtc, pod) |