diff options
| author | Naveen <172697+naveensrinivasan@users.noreply.github.com> | 2022-04-02 16:29:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-02 16:29:37 -0500 |
| commit | 6375a85055b4472846445a37464851429edfa447 (patch) | |
| tree | a296f777fa928beaa40c6e9731d4df161d08d91e /pkg/specgen/generate/oci.go | |
| parent | 9cacc18c951d4497b5979f96d829c86ca41f777f (diff) | |
| parent | d4394ea3688ad1942b8457f6df869f7c440d49e7 (diff) | |
| download | podman-6375a85055b4472846445a37464851429edfa447.tar.gz podman-6375a85055b4472846445a37464851429edfa447.tar.bz2 podman-6375a85055b4472846445a37464851429edfa447.zip | |
Merge branch 'containers:main' into naveen/feat/set-perms-actions
Diffstat (limited to 'pkg/specgen/generate/oci.go')
| -rw-r--r-- | pkg/specgen/generate/oci.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index 1cc3a463f..961cea933 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -352,8 +352,8 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt return nil, err } } - if len(compatibleOptions.InfraDevices) > 0 && len(s.Devices) == 0 { - userDevices = compatibleOptions.InfraDevices + if len(compatibleOptions.HostDeviceList) > 0 && len(s.Devices) == 0 { + userDevices = compatibleOptions.HostDeviceList } else { userDevices = s.Devices } |