Merge pull request #27160 from mlaventure/update-containerd

Update containerd and runc Upstream-commit: 5ee2c2a6475056f55327ce77b61677499a9e3fa8 Component: engine
2016-10-06 19:36:31 +02:00
parent 9f9ffdba55 6e5d016ba6
commit 9ad2ffa17a
18 changed files with 84 additions and 86 deletions
--- a/components/engine/pkg/sysinfo/sysinfo_linux.go
+++ b/components/engine/pkg/sysinfo/sysinfo_linux.go
@ -18,7 +18,7 @@ const (
 )

 func findCgroupMountpoints() (map[string]string, error) {
-	cgMounts, err := cgroups.GetCgroupMounts()
+	cgMounts, err := cgroups.GetCgroupMounts(false)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to parse cgroup information: %v", err)
 	}