Merge pull request #25660 from justincormack/no-fuse-dev

Do not create /dev/fuse by default
This commit is contained in:
Tõnis Tiigi 2016-08-12 10:05:16 -07:00 committed by GitHub
commit b08a1c3fe4
2 changed files with 1 additions and 12 deletions

View File

@ -61,7 +61,6 @@ func (s *DockerSuite) TestDiffEnsureDefaultDevs(c *check.C) {
"A /dev/mqueue": true,
"A /dev/kmsg": true,
"A /dev/fd": true,
"A /dev/fuse": true,
"A /dev/ptmx": true,
"A /dev/null": true,
"A /dev/random": true,

View File

@ -104,17 +104,7 @@ func DefaultSpec() specs.Spec {
// null, zero, full, random, urandom, tty, console, and ptmx.
// ptmx is a bind-mount or symlink of the container's ptmx.
// See also: https://github.com/opencontainers/runtime-spec/blob/master/config-linux.md#default-devices
Devices: []specs.Device{
{
Type: "c",
Path: "/dev/fuse",
Major: 10,
Minor: 229,
FileMode: fmPtr(0666),
UID: u32Ptr(0),
GID: u32Ptr(0),
},
},
Devices: []specs.Device{},
Resources: &specs.Resources{
Devices: []specs.DeviceCgroup{
{