Merge pull request opencontainers#259 from hqhq/hq_fix_cgroup

Fix bug in find cgroup mount point dir
sithembiso · Sep 10, 2015 · cd01b01 · cd01b01
2 parents 5731a04 + b94fe5b
commit cd01b01
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/libcontainer/cgroups/utils.go b/libcontainer/cgroups/utils.go
@@ -80,9 +80,15 @@ func FindCgroupMountpointDir() (string, error) {
 
 	scanner := bufio.NewScanner(f)
 	for scanner.Scan() {
-		txt := scanner.Text()
-		fields := strings.Split(txt, " ")
-		if fields[7] == "cgroup" {
+		text := scanner.Text()
+		fields := strings.Split(text, " ")
+		// Safe as mountinfo encodes mountpoints with spaces as \040.
+		index := strings.Index(text, " - ")
+		postSeparatorFields := strings.Fields(text[index+3:])
+		if len(postSeparatorFields) < 3 {
+			return "", fmt.Errorf("Error found less than 3 fields post '-' in %q", text)
+		}
+		if postSeparatorFields[0] == "cgroup" {
 			return filepath.Dir(fields[4]), nil
 		}
 	}