p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(libcontainer): rename to CapabilitiesMask

Browse Source 
The Capabilities field on libcontainer is actually used as a mask.
Rename the field so that this is more clear.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 128381e0f0372f10f88a847087aa91a972770c4b
Component: engine
This commit is contained in:
Brandon Philips
2014-03-17 10:16:34 -07:00
parent 2684bc55f2
commit ba77c9041d
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/execdriver/native/default_template.go
View File

@ -36,7 +36,7 @@ func createContainer(c *execdriver.Command) *libcontainer.Container {
container.Cgroups.Name = c.ID
if c.Privileged {
container.Capabilities = nil
container.CapabilitiesMask = nil
container.Cgroups.DeviceAccess = true
container.Context["apparmor_profile"] = "unconfined"
}
@ -59,7 +59,7 @@ func createContainer(c *execdriver.Command) *libcontainer.Container {
// the libcontainer configuration file
func getDefaultTemplate() *libcontainer.Container {
return &libcontainer.Container{
Capabilities: libcontainer.Capabilities{
CapabilitiesMask: libcontainer.Capabilities{
libcontainer.GetCapability("SETPCAP"),
libcontainer.GetCapability("SYS_MODULE"),
libcontainer.GetCapability("SYS_RAWIO"),