diff --git a/libdevice/devices_unix.go b/libdevice/devices_unix.go index 36a6ada205784b200ab2648ae4d4bea6d088c917..e98bb974d5d8bf842c65c39434dee93e63f7d29b 100644 --- a/libdevice/devices_unix.go +++ b/libdevice/devices_unix.go @@ -18,15 +18,16 @@ package libdevice import ( "errors" "fmt" - "github.com/mrunalp/fileutils" - "github.com/sirupsen/logrus" - "golang.org/x/sys/unix" - "isula.org/syscontainer-tools/types" "os" "os/exec" "path/filepath" "strings" "syscall" + + "github.com/mrunalp/fileutils" + "github.com/sirupsen/logrus" + "golang.org/x/sys/unix" + "isula.org/syscontainer-tools/types" ) var ( @@ -286,7 +287,6 @@ func AddDeviceToSysBlock(node *types.Device) error { if err != nil { return err } - hostDeviceName := filepath.Base(realPath) containerDeviceName := filepath.Base(node.Path) if err := os.Chdir(filepath.Join(node.Root, MountSourcePath)); err != nil { return err @@ -303,14 +303,6 @@ func AddDeviceToSysBlock(node *types.Device) error { if err := os.Symlink(destPath, containerDeviceName); err != nil { return err } - if err := os.Chdir(filepath.Join(node.Root, "/dev")); err != nil { - return err - } - if hostDeviceName != containerDeviceName { - if _, err := os.Stat(hostDeviceName); os.IsNotExist(err) { - return os.Symlink(containerDeviceName, hostDeviceName) - } - } return nil } @@ -318,20 +310,11 @@ func AddDeviceToSysBlock(node *types.Device) error { func RemoveDeviceFromSysBlock(path string) error { containerDeviceName := filepath.Base(path) linkPath := filepath.Join(MountDestPath, containerDeviceName) - realPath, err := os.Readlink(linkPath) - if err != nil { - return err - } - hostDeviceName := filepath.Base(realPath) - devPath := filepath.Join("/dev", hostDeviceName) if _, err := os.Lstat(linkPath); err == nil { if err := os.Remove(linkPath); err != nil { return err } } - if hostDeviceName != containerDeviceName { - return os.Remove(devPath) - } return nil }