kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix get pids for nsinit

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-02-24 16:26:06 -08:00
parent a76407ac61
commit 9bf6cb2692
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
execdriver/namespaces/default_template.go
View file

@ -34,7 +34,7 @@ func getDefaultTemplate() *libcontainer.Container {
libcontainer.CLONE_NEWUTS, libcontainer.CLONE_NEWUTS,
}, },
Cgroups: &cgroups.Cgroup{ Cgroups: &cgroups.Cgroup{
Name: "docker", Parent: "docker",
DeviceAccess: false, DeviceAccess: false,
}, },
} }

5
execdriver/namespaces/driver.go
View file

@ -129,13 +129,11 @@ func (d *driver) Name() string {
func (d *driver) GetPidsForContainer(id string) ([]int, error) { func (d *driver) GetPidsForContainer(id string) ([]int, error) {
pids := []int{} pids := []int{}
subsystem := "cpu" subsystem := "devices"
cgroupRoot, err := cgroups.FindCgroupMountpoint(subsystem) cgroupRoot, err := cgroups.FindCgroupMountpoint(subsystem)
if err != nil { if err != nil {
return pids, err return pids, err
} }
cgroupRoot = filepath.Dir(cgroupRoot)
cgroupDir, err := cgroups.GetThisCgroupDir(subsystem) cgroupDir, err := cgroups.GetThisCgroupDir(subsystem)
if err != nil { if err != nil {
return pids, err return pids, err
@ -252,6 +250,7 @@ func createContainer(c *execdriver.Command) *libcontainer.Container {
}, },
} }
} }
container.Cgroups.Name = c.ID
if c.Privileged { if c.Privileged {
container.Capabilities = nil container.Capabilities = nil
container.Cgroups.DeviceAccess = true container.Cgroups.DeviceAccess = true