Merge pull request google#388 from rjnagal/validate

Fix cgroup root path detection.
sreuter · Dec 22, 2014 · d3b24a3 · d3b24a3
2 parents 7f08c8f + c8eecef
commit d3b24a3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/validate/validate.go b/validate/validate.go
@@ -23,6 +23,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"path"
 	"strings"
 
 	"github.com/docker/libcontainer/cgroups"
@@ -188,7 +189,7 @@ func validateCgroupMounts() (string, string) {
 		out += desc
 		return Unknown, out
 	}
-	mnt = strings.TrimSuffix(mnt, "/cpu")
+	mnt = path.Dir(mnt)
 	if !utils.FileExists(mnt) {
 		out := fmt.Sprintf("Cgroup mount directory %s inaccessible.\n", mnt)
 		out += desc