packages/syscontainer-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "syscontainer-tools: do not create device soft link in /dev"

Browse Source 
This reverts commit 974a76b3abffffd58d0efd403ba912049ee4a64a.
This commit is contained in:
zhangsong34 2020-03-26 10:28:18 +08:00
parent 397cd53e92
commit d4b2a53d07
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libdevice/devices_unix.go
View File

@ -18,16 +18,15 @@ 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 (
@ -287,6 +286,7 @@ 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,6 +303,14 @@ 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
}
@ -310,11 +318,20 @@ 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
}