From 0512e7ee6add4a59436409ade3676b4978f159a0 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <lk4d4@docker.com>
Date: Wed, 5 Aug 2015 15:25:15 -0700
Subject: [PATCH] Replace Linux.Device with more specific config

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
---
 config-linux.md | 32 +++++++++++++++++++++-----------
 spec_linux.go   | 23 ++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/config-linux.md b/config-linux.md
index 1927dae55..21fa29497 100644
--- a/config-linux.md
+++ b/config-linux.md
@@ -55,20 +55,30 @@ within the container.
 
 ### Access to devices
 
-Devices is an array specifying the list of devices from the host to make available in the container.
-By providing a device name within the list the runtime should look up the same device on the host's `/dev`
-and collect information about the device node so that it can be recreated for the container.  The runtime
-should not only create the device inside the container but ensure that the root user inside 
-the container has access rights for the device.
+Devices is an array specifying the list of devices to be created in the container.
+Next parameters can be specified:
+
+* type - type of device: 'c', 'b', 'u' or 'p'. More info in `man mknod`
+* path - full path to device inside container
+* major, minor - major, minor numbers for device. More info in `man mknod`
+* permissions - cgroup permissions for device. A composition of 'r'
+				(read), 'w' (write), and 'm' (mknod).
+* fileMode - file mode for device file
+* uid - uid of device owner
+* gid - gid of device owner
 
 ```json
    "devices": [
-        "null",
-        "random",
-        "full",
-        "tty",
-        "zero",
-        "urandom"
+        {
+            "path": "/dev/random",
+            "type": "c",
+            "major": 1,
+            "minor": 8,
+            "permissions": "rwm",
+            "fileMode": 0666,
+            "uid": 0,
+            "gid": 0
+        }
     ]
 ```
 
diff --git a/spec_linux.go b/spec_linux.go
index 3c82db4b4..7b41bf565 100644
--- a/spec_linux.go
+++ b/spec_linux.go
@@ -2,6 +2,8 @@
 
 package specs
 
+import "os"
+
 // LinuxSpec is the full specification for Linux containers
 type LinuxSpec struct {
 	Spec
@@ -27,7 +29,7 @@ type Linux struct {
 	// Capabilities are Linux capabilities that are kept for the container
 	Capabilities []string `json:"capabilities"`
 	// Devices are a list of device nodes that are created and enabled for the container
-	Devices []string `json:"devices"`
+	Devices []Device `json:"devices"`
 	// RootfsPropagation is the rootfs mount propagation mode for the container
 	RootfsPropagation string `json:"rootfsPropagation"`
 }
@@ -157,3 +159,22 @@ type Resources struct {
 	// Network restriction configuration
 	Network Network `json:"network"`
 }
+
+type Device struct {
+	// Device type, block, char, etc.
+	Type rune `json:"type"`
+	// Path to the device.
+	Path string `json:"path"`
+	// Major is the device's major number.
+	Major int64 `json:"major"`
+	// Minor is the device's minor number.
+	Minor int64 `json:"minor"`
+	// Cgroup permissions format, rwm.
+	Permissions string `json:"permissions"`
+	// FileMode permission bits for the device.
+	FileMode os.FileMode `json:"fileMode"`
+	// Uid of the device.
+	Uid uint32 `json:"uid"`
+	// Gid of the device.
+	Gid uint32 `json:"gid"`
+}