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).
This commit is contained in:
parent
21e1d8f917
commit
c8eecef6d5
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user