jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #259 from hqhq/hq_fix_cgroup 

Fix bug in find cgroup mount point dir
This commit is contained in:
Mrunal Patel 2015-09-10 12:01:22 -07:00
parent 5731a045fe b94fe5b7f8
commit cd01b01018
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libcontainer/cgroups/utils.go
View File

@ -80,9 +80,15 @@ func FindCgroupMountpointDir() (string, error) {
scanner := bufio.NewScanner(f) scanner := bufio.NewScanner(f)
for scanner.Scan() { for scanner.Scan() {
txt := scanner.Text() text := scanner.Text()
fields := strings.Split(txt, " ") fields := strings.Split(text, " ")
if fields[7] == "cgroup" { // Safe as mountinfo encodes mountpoints with spaces as \040.
index := strings.Index(text, " - ")
postSeparatorFields := strings.Fields(text[index+3:])
if len(postSeparatorFields) < 3 {
return "", fmt.Errorf("Error found less than 3 fields post '-' in %q", text)
}
if postSeparatorFields[0] == "cgroup" {
return filepath.Dir(fields[4]), nil return filepath.Dir(fields[4]), nil
} }
} }