jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not prevent mounts in /sys 

Mounts in /sys like /sys/fs/cgroup are valid and should be allowed at
the libcontainer level.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2015-05-08 10:47:51 -07:00
parent 3c659cb2ea
commit 02e6427ecf
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rootfs_linux.go
View File

@ -215,7 +215,6 @@ func checkMountDestination(rootfs, dest string) error {
} }
invalidDestinations := []string{ invalidDestinations := []string{
"/proc", "/proc",
"/sys",
} }
for _, invalid := range invalidDestinations { for _, invalid := range invalidDestinations {
path, err := filepath.Rel(filepath.Join(rootfs, invalid), dest) path, err := filepath.Rel(filepath.Join(rootfs, invalid), dest)

4
rootfs_linux_test.go
View File

@ -15,8 +15,8 @@ func TestCheckMountDestOnProc(t *testing.T) {
func TestCheckMountDestInSys(t *testing.T) { func TestCheckMountDestInSys(t *testing.T) {
dest := "/rootfs//sys/fs/cgroup" dest := "/rootfs//sys/fs/cgroup"
err := checkMountDestination("/rootfs", dest) err := checkMountDestination("/rootfs", dest)
if err == nil { if err != nil {
t.Fatal("destination inside proc should return an error") t.Fatal("destination inside /sys should not return an error")
} }
} }