vbatts/pkg
1
0
Fork 0
Code Pull requests Releases 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)
This commit is contained in:
Brandon Philips 2014-03-17 10:16:34 -07:00
parent a518a10209
commit 4f5c96a769
4 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libcontainer/capabilities/capabilities.go
View file

@ -9,7 +9,7 @@ import (
// DropCapabilities drops capabilities for the current process based
// on the container's configuration.
func DropCapabilities(container *libcontainer.Container) error {
if drop := getCapabilities(container); len(drop) > 0 {
if drop := getCapabilitiesMask(container); len(drop) > 0 {
c, err := capability.NewPid(os.Getpid())
if err != nil {
return err
@ -23,10 +23,10 @@ func DropCapabilities(container *libcontainer.Container) error {
return nil
}
// getCapabilities returns the specific cap values for the libcontainer types
func getCapabilities(container *libcontainer.Container) []capability.Cap {
// getCapabilitiesMask returns the specific cap mask values for the libcontainer types
func getCapabilitiesMask(container *libcontainer.Container) []capability.Cap {
drop := []capability.Cap{}
for _, c := range container.Capabilities {
for _, c := range container.CapabilitiesMask {
drop = append(drop, c.Value)
}
return drop