Merge pull request #4992 from crosbymichael/fix-mknod-test
Fix configuration test for MKNOD
This commit is contained in:
commit
95d07b52b3
|
@ -7,7 +7,7 @@ import (
|
||||||
|
|
||||||
// New returns the docker default configuration for libcontainer
|
// New returns the docker default configuration for libcontainer
|
||||||
func New() *libcontainer.Container {
|
func New() *libcontainer.Container {
|
||||||
return &libcontainer.Container{
|
container := &libcontainer.Container{
|
||||||
CapabilitiesMask: libcontainer.Capabilities{
|
CapabilitiesMask: libcontainer.Capabilities{
|
||||||
libcontainer.GetCapability("SETPCAP"),
|
libcontainer.GetCapability("SETPCAP"),
|
||||||
libcontainer.GetCapability("SYS_MODULE"),
|
libcontainer.GetCapability("SYS_MODULE"),
|
||||||
|
@ -23,6 +23,7 @@ func New() *libcontainer.Container {
|
||||||
libcontainer.GetCapability("MAC_OVERRIDE"),
|
libcontainer.GetCapability("MAC_OVERRIDE"),
|
||||||
libcontainer.GetCapability("MAC_ADMIN"),
|
libcontainer.GetCapability("MAC_ADMIN"),
|
||||||
libcontainer.GetCapability("NET_ADMIN"),
|
libcontainer.GetCapability("NET_ADMIN"),
|
||||||
|
libcontainer.GetCapability("MKNOD"),
|
||||||
},
|
},
|
||||||
Namespaces: libcontainer.Namespaces{
|
Namespaces: libcontainer.Namespaces{
|
||||||
libcontainer.GetNamespace("NEWNS"),
|
libcontainer.GetNamespace("NEWNS"),
|
||||||
|
@ -39,4 +40,6 @@ func New() *libcontainer.Container {
|
||||||
"apparmor_profile": "docker-default",
|
"apparmor_profile": "docker-default",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
container.CapabilitiesMask.Get("MKNOD").Enabled = true
|
||||||
|
return container
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue