[lxc-devel] [lxd/master] remove fuse device from docker profile

[tych0 on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 377 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160720/480c80b2/attachment.bin>
-------------- next part --------------
From 056c1175aaa084c1506d31c5efd44b821dd02bdc Mon Sep 17 00:00:00 2001
From: Tycho Andersen <tycho.andersen at canonical.com>
Date: Tue, 19 Jul 2016 16:36:54 -0600
Subject: [PATCH] remove fuse device from docker profile

Closes #2213

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
---
 lxd/db_profiles.go | 6 +-----
 lxd/db_test.go     | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lxd/db_profiles.go b/lxd/db_profiles.go
index d97f974..c3a5ff1 100644
--- a/lxd/db_profiles.go
+++ b/lxd/db_profiles.go
@@ -130,16 +130,12 @@ func dbProfileCreateDocker(db *sql.DB) error {
 	config := map[string]string{
 		"security.nesting":     "true",
 		"linux.kernel_modules": "overlay, nf_nat"}
-	fusedev := map[string]string{
-		"path": "/dev/fuse",
-		"type": "unix-char",
-	}
 	aadisable := map[string]string{
 		"path":   "/sys/module/apparmor/parameters/enabled",
 		"type":   "disk",
 		"source": "/dev/null",
 	}
-	devices := map[string]shared.Device{"fuse": fusedev, "aadisable": aadisable}
+	devices := map[string]shared.Device{"aadisable": aadisable}
 
 	_, err = dbProfileCreate(db, "docker", "Profile supporting docker in containers", config, devices)
 	return err
diff --git a/lxd/db_test.go b/lxd/db_test.go
index f34adfc..eece15e 100644
--- a/lxd/db_test.go
+++ b/lxd/db_test.go
@@ -22,7 +22,7 @@ const DB_FIXTURES string = `
     INSERT INTO images_properties (image_id, type, key, value) VALUES (1, 0, 'thekey', 'some value');
     INSERT INTO profiles_config (profile_id, key, value) VALUES (3, 'thekey', 'thevalue');
     INSERT INTO profiles_devices (profile_id, name, type) VALUES (3, 'devicename', 1);
-    INSERT INTO profiles_devices_config (profile_device_id, key, value) VALUES (4, 'devicekey', 'devicevalue');
+    INSERT INTO profiles_devices_config (profile_device_id, key, value) VALUES (3, 'devicekey', 'devicevalue');
     `
 
 //  This Helper will initialize a test in-memory DB.