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

Move systemd code into pkg

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:30:08 -07:00
parent a183681b1d
commit 9f508e4b3e
5 changed files with 46 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libcontainer/nsinit/exec.go
View file

@ -8,6 +8,7 @@ import (
"syscall"
"github.com/dotcloud/docker/pkg/cgroups"
"github.com/dotcloud/docker/pkg/cgroups/systemd"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/network"
"github.com/dotcloud/docker/pkg/system"
@ -99,7 +100,11 @@ func (ns *linuxNs) Exec(container *libcontainer.Container, term Terminal, args [
func (ns *linuxNs) SetupCgroups(container *libcontainer.Container, nspid int) (cgroups.ActiveCgroup, error) {
if container.Cgroups != nil {
return cgroups.Apply(container.Cgroups, nspid)
c := container.Cgroups
if systemd.UseSystemd() {
return systemd.Apply(c, nspid)
}
return rawApply(c, nspid)
}
return nil, nil
}