Ignore cgroup2 mountpoints

Our current cgroup parsing logic assumes cgroup v1 mounts so we should ignore cgroup2 mounts for now Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
opencontainers · Jan 11, 2017 · e7b57cb · e7b57cb
1 parent 5d93fed
commit e7b57cb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libcontainer/cgroups/utils.go b/libcontainer/cgroups/utils.go
@@ -149,7 +149,7 @@ func getCgroupMountsHelper(ss map[string]bool, mi io.Reader, all bool) ([]Mount,
 		if sepIdx == -1 {
 			return nil, fmt.Errorf("invalid mountinfo format")
 		}
-		if txt[sepIdx+3:sepIdx+9] != "cgroup" {
+		if txt[sepIdx+3:sepIdx+10] == "cgroup2" || txt[sepIdx+3:sepIdx+9] != "cgroup" {
 			continue
 		}
 		fields := strings.Split(txt, " ")