From c8eecef6d5cbfb9255d14925dee3da7481127cfd Mon Sep 17 00:00:00 2001
From: Rohit Jnagal <jnagal@google.com>
Date: Mon, 22 Dec 2014 22:37:04 +0000
Subject: [PATCH] Fix cgroup root path detection. The current logic assumes
 that cpu cgroup mnt point is <basepath>/cpu. On some systems, its
 <basepath>/cpu,cpuacct (CentOS 7).

---
 validate/validate.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/validate/validate.go b/validate/validate.go
index c386dc526e..0487cdc92d 100644
--- 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