diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-04 11:08:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 11:08:43 +0200 |
| commit | 51d0be42046f691e81cddfe2712baa14cecbdfbe (patch) | |
| tree | 31a4708b600b60a5a9c5529637721f1a5d88e195 /pkg/specgen/generate/oci.go | |
| parent | 7b941462d42aa76b134462ff92a6823359d2cf76 (diff) | |
| parent | 7d37f4bbfee8def704cf38ec74f91e3e0db61723 (diff) | |
| download | podman-51d0be42046f691e81cddfe2712baa14cecbdfbe.tar.gz podman-51d0be42046f691e81cddfe2712baa14cecbdfbe.tar.bz2 podman-51d0be42046f691e81cddfe2712baa14cecbdfbe.zip | |
Merge pull request #6051 from rhatdan/containers.conf
Fixes for test/e2e/containers_conf_test.go
Diffstat (limited to 'pkg/specgen/generate/oci.go')
| -rw-r--r-- | pkg/specgen/generate/oci.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index 7993777fb..8136c0993 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -267,6 +267,13 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt return nil, err } } else { + // add default devices from containers.conf + for _, device := range rtc.Containers.Devices { + if err := DevicesFromPath(&g, device); err != nil { + return nil, err + } + } + // add default devices specified by caller for _, device := range s.Devices { if err := DevicesFromPath(&g, device.Path); err != nil { return nil, err @@ -297,7 +304,7 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt } configSpec := g.Config - if err := securityConfigureGenerator(s, &g, newImage); err != nil { + if err := securityConfigureGenerator(s, &g, newImage, rtc); err != nil { return nil, err } |