From 834e53144bb46d1adda5bc901b1062dc61311ba9 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 12 Aug 2016 11:18:41 +0100 Subject: [PATCH] Do not create /dev/fuse by default This device is not required by the OCI spec. The rationale for this was linked to https://github.com/docker/docker/issues/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. Signed-off-by: Justin Cormack --- libcontainer/SPEC.md | 1 - libcontainer/configs/device_defaults.go | 16 +--------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/libcontainer/SPEC.md b/libcontainer/SPEC.md index 32578f01..e5894c64 100644 --- a/libcontainer/SPEC.md +++ b/libcontainer/SPEC.md @@ -71,7 +71,6 @@ that are required for executing a container's process. | /dev/tty | 0666 | rwm | | /dev/random | 0666 | rwm | | /dev/urandom | 0666 | rwm | -| /dev/fuse | 0666 | rwm | **ptmx** diff --git a/libcontainer/configs/device_defaults.go b/libcontainer/configs/device_defaults.go index ba1f437f..4d348d21 100644 --- a/libcontainer/configs/device_defaults.go +++ b/libcontainer/configs/device_defaults.go @@ -107,19 +107,5 @@ var ( Permissions: "rwm", }, }, DefaultSimpleDevices...) - DefaultAutoCreatedDevices = append([]*Device{ - { - // /dev/fuse is created but not allowed. - // This is to allow java to work. Because java - // Insists on there being a /dev/fuse - // https://github.com/docker/docker/issues/514 - // https://github.com/docker/docker/issues/2393 - // - Path: "/dev/fuse", - Type: 'c', - Major: 10, - Minor: 229, - Permissions: "rwm", - }, - }, DefaultSimpleDevices...) + DefaultAutoCreatedDevices = append([]*Device{}, DefaultSimpleDevices...) )