github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

export oci.DeviceFromPath()

Browse Source 
This will help to reduce the amount of runc/libcontainer code that's used in
Moby / Docker Engine (in favor of using the containerd implementation).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2021-12-01 17:05:42 +01:00
parent 16c233b6d7
commit f3195b3b51
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oci/spec_opts.go
View File

@ -1213,7 +1213,7 @@ func WithLinuxDevice(path, permissions string) SpecOpts {
setLinux(s) setLinux(s)
setResources(s) setResources(s)
dev, err := deviceFromPath(path) dev, err := DeviceFromPath(path)
if err != nil { if err != nil {
return err return err
} }

2
oci/spec_opts_windows.go
View File

@ -72,6 +72,6 @@ func WithHostDevices(_ context.Context, _ Client, _ *containers.Container, s *Sp
return nil return nil
} }
func deviceFromPath(path string) (*specs.LinuxDevice, error) { func DeviceFromPath(path string) (*specs.LinuxDevice, error) {
return nil, errors.New("device from path not supported on Windows") return nil, errors.New("device from path not supported on Windows")
} }

15
oci/utils_unix.go
View File

@ -28,7 +28,8 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
var errNotADevice = errors.New("not a device node") // ErrNotADevice denotes that a file is not a valid linux device.
var ErrNotADevice = errors.New("not a device node")
// HostDevices returns all devices that can be found under /dev directory. // HostDevices returns all devices that can be found under /dev directory.
func HostDevices() ([]specs.LinuxDevice, error) { func HostDevices() ([]specs.LinuxDevice, error) {
@ -42,7 +43,7 @@ func getDevices(path, containerPath string) ([]specs.LinuxDevice, error) {
} }
if !stat.IsDir() { if !stat.IsDir() {
dev, err := deviceFromPath(path) dev, err := DeviceFromPath(path)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -81,9 +82,9 @@ func getDevices(path, containerPath string) ([]specs.LinuxDevice, error) {
case f.Name() == "console": case f.Name() == "console":
continue continue
} }
device, err := deviceFromPath(filepath.Join(path, f.Name())) device, err := DeviceFromPath(filepath.Join(path, f.Name()))
if err != nil { if err != nil {
if err == errNotADevice { if err == ErrNotADevice {
continue continue
} }
if os.IsNotExist(err) { if os.IsNotExist(err) {
@ -110,7 +111,9 @@ const (
fifoDevice = "p" fifoDevice = "p"
) )
func deviceFromPath(path string) (*specs.LinuxDevice, error) { // DeviceFromPath takes the path to a device to look up the information about a
// linux device and returns that information as a LinuxDevice struct.
func DeviceFromPath(path string) (*specs.LinuxDevice, error) {
var stat unix.Stat_t var stat unix.Stat_t
if err := unix.Lstat(path, &stat); err != nil { if err := unix.Lstat(path, &stat); err != nil {
return nil, err return nil, err
@ -135,7 +138,7 @@ func deviceFromPath(path string) (*specs.LinuxDevice, error) {
case unix.S_IFIFO: case unix.S_IFIFO:
devType = fifoDevice devType = fifoDevice
default: default:
return nil, errNotADevice return nil, ErrNotADevice
} }
fm := os.FileMode(mode &^ unix.S_IFMT) fm := os.FileMode(mode &^ unix.S_IFMT)
return &specs.LinuxDevice{ return &specs.LinuxDevice{