Merge pull request #43053 from thaJeztah/use_containerd_oci_devices

daemon.WithDevices(): use containerd's HostDevices()
moby · Jan 5, 2022 · 6faceab · 6faceab
2 parents 520dfc3 + 9d9b8e0
commit 6faceab
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go
@@ -27,7 +27,6 @@ import (
 	"github.com/moby/sys/mount"
 	"github.com/moby/sys/mountinfo"
 	"github.com/opencontainers/runc/libcontainer/cgroups"
-	"github.com/opencontainers/runc/libcontainer/devices"
 	"github.com/opencontainers/runc/libcontainer/user"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
@@ -874,13 +873,11 @@ func WithDevices(daemon *Daemon, c *container.Container) coci.SpecOpts {
 		devPermissions := s.Linux.Resources.Devices
 
 		if c.HostConfig.Privileged && !userns.RunningInUserNS() {
-			hostDevices, err := devices.HostDevices()
+			hostDevices, err := coci.HostDevices()
 			if err != nil {
 				return err
 			}
-			for _, d := range hostDevices {
-				devs = append(devs, oci.Device(d))
-			}
+			devs = append(devs, hostDevices...)
 
 			// adding device mappings in privileged containers
 			for _, deviceMapping := range c.HostConfig.Devices {