1. docker
  2. Commit 39ecc08f327451e4fc30f15a6fb3bd4c979acc73
Browse code

Do not create /dev/fuse by default

This device is not required by the OCI spec.

The rationale for this was linked to docker/docker#2393

So a non functional /dev/fuse was created, and actual fuse use still is
required to add the device explicitly. However even old versions of the JVM
on Ubuntu 12.04 no longer require the fuse package, and this is all not
needed.

See also https://github.com/opencontainers/runc/pull/983 although this
change alone stops the fuse device being created.

Tested and does not change actual ability to use fuse.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>

Justin Cormack authored on 2016/08/12 20:07:01
Showing 2 changed files
integration-cli/docker_cli_diff_test.go
History View file @ 39ecc08
... ... 
@@ -61,7 +61,6 @@ func (s *DockerSuite) TestDiffEnsureDefaultDevs(c *check.C) {
61 61 
 		"A /dev/mqueue":  true,
62 62 
 		"A /dev/kmsg":    true,
63 63 
 		"A /dev/fd":      true,
64 
-		"A /dev/fuse":    true,
65 64 
 		"A /dev/ptmx":    true,
66 65 
 		"A /dev/null":    true,
67 66 
 		"A /dev/random":  true,
oci/defaults_linux.go
History View file @ 39ecc08
... ... 
@@ -104,17 +104,7 @@ func DefaultSpec() specs.Spec {
104 104 
 		// null, zero, full, random, urandom, tty, console, and ptmx.
105 105 
 		// ptmx is a bind-mount or symlink of the container's ptmx.
106 106 
 		// See also: https://github.com/opencontainers/runtime-spec/blob/master/config-linux.md#default-devices
107 
-		Devices: []specs.Device{
108 
-			{
109 
-				Type:     "c",
110 
-				Path:     "/dev/fuse",
111 
-				Major:    10,
112 
-				Minor:    229,
113 
-				FileMode: fmPtr(0666),
114 
-				UID:      u32Ptr(0),
115 
-				GID:      u32Ptr(0),
116 
-			},
117 
-		},
107 
+		Devices: []specs.Device{},
118 108 
 		Resources: &specs.Resources{
119 109 
 			Devices: []specs.DeviceCgroup{
120 110 
 				{