Merge branch 'master' of ssh://github.com/dotcloud/docker

Upstream-commit: f6b5cd77ebfff7b18dbfcdb8bfddce0f93305e23 Component: engine
2013-05-03 15:37:37 -07:00
parent d65444fd93 06be1f94f8
commit 5f130205ae
1 changed files with 1 additions and 1 deletions
--- a/components/engine/utils.go
+++ b/components/engine/utils.go
@ -445,7 +445,7 @@ func FindCgroupMountpoint(cgroupType string) (string, error) {
 	// cgroup /sys/fs/cgroup/devices cgroup rw,relatime,devices 0 0
 	for _, line := range strings.Split(string(output), "\n") {
 		parts := strings.Split(line, " ")
-		if parts[2] == "cgroup" {
+		if len(parts) == 6 && parts[2] == "cgroup" {
 			for _, opt := range strings.Split(parts[3], ",") {
 				if opt == cgroupType {
 					return parts[1], nil