Merge pull request #13196 from crosbymichael/update-libocntainer-may13

Update libcontainer to a37b2a4f152e2a1c9de596f54c0
This commit is contained in:
Alexander Morozov
2015-05-14 10:49:25 -07:00
11 changed files with 36 additions and 19 deletions
+3 -3
View File
@@ -3245,8 +3245,8 @@ func (s *DockerSuite) TestMountIntoProc(c *check.C) {
func (s *DockerSuite) TestMountIntoSys(c *check.C) {
testRequires(c, NativeExecDriver)
defer deleteAllContainers()
code, err := runCommand(exec.Command(dockerBinary, "run", "-v", "/sys/", "busybox", "true"))
if err == nil || code == 0 {
c.Fatal("container should not be able to mount into /sys")
_, err := runCommand(exec.Command(dockerBinary, "run", "-v", "/sys/fs/cgroup", "busybox", "true"))
if err != nil {
c.Fatal("container should be able to mount into /sys/fs/cgroup")
}
}