Merge pull request #501 from losinggeneration/fix_cgroup_memory_check

- runtime: strings.Split may return an empty string on no match Upstream-commit: c34989f1c49fe7d652a48215fa5a6f869245c5e4 Component: engine
2013-05-03 14:29:43 -07:00
parent 0d8c032587 8f0ba8b1bd
commit 06be1f94f8
1 changed files with 1 additions and 1 deletions
@@ -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