diff --git a/execdriver/namespaces/default_template.go b/execdriver/namespaces/default_template.go index 79b6ac1c11..f84544adc9 100644 --- a/execdriver/namespaces/default_template.go +++ b/execdriver/namespaces/default_template.go @@ -34,7 +34,7 @@ func getDefaultTemplate() *libcontainer.Container { libcontainer.CLONE_NEWUTS, }, Cgroups: &cgroups.Cgroup{ - Name: "docker", + Parent: "docker", DeviceAccess: false, }, } diff --git a/execdriver/namespaces/driver.go b/execdriver/namespaces/driver.go index cd5bb9f35e..8143b39d90 100644 --- a/execdriver/namespaces/driver.go +++ b/execdriver/namespaces/driver.go @@ -129,13 +129,11 @@ func (d *driver) Name() string { func (d *driver) GetPidsForContainer(id string) ([]int, error) { pids := []int{} - subsystem := "cpu" + subsystem := "devices" cgroupRoot, err := cgroups.FindCgroupMountpoint(subsystem) if err != nil { return pids, err } - cgroupRoot = filepath.Dir(cgroupRoot) - cgroupDir, err := cgroups.GetThisCgroupDir(subsystem) if err != nil { return pids, err @@ -252,6 +250,7 @@ func createContainer(c *execdriver.Command) *libcontainer.Container { }, } } + container.Cgroups.Name = c.ID if c.Privileged { container.Capabilities = nil container.Cgroups.DeviceAccess = true