Explorar el Código

Merge pull request #501 from losinggeneration/fix_cgroup_memory_check

- runtime: strings.Split may return an empty string on no match
Guillaume J. Charmes hace 12 años
padre
commit
c34989f1c4
Se han modificado 1 ficheros con 1 adiciones y 1 borrados
  1. 1 1
      utils.go

+ 1 - 1
utils.go

@@ -445,7 +445,7 @@ func FindCgroupMountpoint(cgroupType string) (string, error) {
 	// cgroup /sys/fs/cgroup/devices cgroup rw,relatime,devices 0 0
 	// cgroup /sys/fs/cgroup/devices cgroup rw,relatime,devices 0 0
 	for _, line := range strings.Split(string(output), "\n") {
 	for _, line := range strings.Split(string(output), "\n") {
 		parts := strings.Split(line, " ")
 		parts := strings.Split(line, " ")
-		if parts[2] == "cgroup" {
+		if len(parts) == 6 && parts[2] == "cgroup" {
 			for _, opt := range strings.Split(parts[3], ",") {
 			for _, opt := range strings.Split(parts[3], ",") {
 				if opt == cgroupType {
 				if opt == cgroupType {
 					return parts[1], nil
 					return parts[1], nil