Fix duplicate entries and missing entries in getCgroupMountsHelper

Signed-off-by: Jay Kamat <[email protected]>
opencontainers · Aug 1, 2018 · a2faaa1 · a2faaa1
1 parent e5a7c61
commit a2faaa1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/libcontainer/cgroups/utils.go b/libcontainer/cgroups/utils.go
@@ -155,14 +155,16 @@ func getCgroupMountsHelper(ss map[string]bool, mi io.Reader, all bool) ([]Mount,
 			if !known || (!all && seen) {
 				continue
 			}
+			ss[opt] = true
 			if strings.HasPrefix(opt, cgroupNamePrefix) {
 				opt = opt[len(cgroupNamePrefix):]
 			}
 			m.Subsystems = append(m.Subsystems, opt)
-			ss[opt] = true
 			numFound++
 		}
-		res = append(res, m)
+		if len(m.Subsystems) > 0 || all {
+			res = append(res, m)
+		}
 	}
 	if err := scanner.Err(); err != nil {
 		return nil, err