diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-26 09:31:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-26 09:31:06 -0400 |
| commit | fef3ea80aa597fb8fb0cb133b4d7410d1e2a65d6 (patch) | |
| tree | c11b5aff7eb871af2ed6375bd4adc600bf43ea88 /libpod/container_internal_linux.go | |
| parent | 333817a187f7811919b9f5fb75a829fe5abfbc44 (diff) | |
| parent | db7cff8c86a35a4b1971c3fbb2365eff9cc205d4 (diff) | |
| download | podman-fef3ea80aa597fb8fb0cb133b4d7410d1e2a65d6.tar.gz podman-fef3ea80aa597fb8fb0cb133b4d7410d1e2a65d6.tar.bz2 podman-fef3ea80aa597fb8fb0cb133b4d7410d1e2a65d6.zip | |
Merge pull request #10081 from sjug/cdi_device_lib
Add support for CDI device configuration
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 1986f7438..f4762b5ff 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -20,6 +20,7 @@ import ( "time" metadata "github.com/checkpoint-restore/checkpointctl/lib" + cdi "github.com/container-orchestrated-devices/container-device-interface/pkg" cnitypes "github.com/containernetworking/cni/pkg/types/current" "github.com/containernetworking/plugins/pkg/ns" "github.com/containers/buildah/pkg/chrootuser" @@ -704,6 +705,13 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { } g.SetLinuxCgroupsPath(cgroupPath) + // Warning: CDI may alter g.Config in place. + if len(c.config.CDIDevices) > 0 { + if err = cdi.UpdateOCISpecForDevices(g.Config, c.config.CDIDevices); err != nil { + return nil, errors.Wrapf(err, "error setting up CDI devices") + } + } + // Mounts need to be sorted so paths will not cover other paths mounts := sortMounts(g.Mounts()) g.ClearMounts() |