Merge pull request #966 from sjenning/fix-initscope-cgroup-path

Mrunal Patel · web-flow · commit 56fc0ac9ce92 · 2016-08-01T14:29:47.000-07:00
fix init.scope in cgroup paths
diff --git a/libcontainer/cgroups/systemd/apply_systemd.go b/libcontainer/cgroups/systemd/apply_systemd.go
@@ -388,6 +388,8 @@ func getSubsystemPath(c *configs.Cgroup, subsystem string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	// if pid 1 is systemd 226 or later, it will be in init.scope, not the root
+	initPath = strings.TrimSuffix(filepath.Clean(initPath), "init.scope")
 
 	slice := "system.slice"
 	if c.Parent != "" {

Original file line number	Diff line number	Diff line change
`@@ -388,6 +388,8 @@ func getSubsystemPath(c *configs.Cgroup, subsystem string) (string, error) {`
`388`	`388`	`if err != nil {`
`389`	`389`	`return "", err`
`390`	`390`	`}`
	`391`	`+ // if pid 1 is systemd 226 or later, it will be in init.scope, not the root`
	`392`	`+ initPath = strings.TrimSuffix(filepath.Clean(initPath), "init.scope")`
`391`	`393`
`392`	`394`	`slice := "system.slice"`
`393`	`395`	`if c.Parent != "" {`