vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Move raw cgroups into fs package (filesystem)

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-04-18 21:34:26 -07:00
parent 9f508e4b3e
commit 8cc8aca9cc
3 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libcontainer/nsinit/exec.go
View file

@ -8,6 +8,7 @@ import (
"syscall"
"github.com/dotcloud/docker/pkg/cgroups"
"github.com/dotcloud/docker/pkg/cgroups/fs"
"github.com/dotcloud/docker/pkg/cgroups/systemd"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/network"
@ -104,7 +105,7 @@ func (ns *linuxNs) SetupCgroups(container *libcontainer.Container, nspid int) (c
if systemd.UseSystemd() {
return systemd.Apply(c, nspid)
}
return rawApply(c, nspid)
return fs.Apply(c, nspid)
}
return nil, nil
}