From a504885311a7860bd109bd5f1d56c667d8c0f253 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Fri, 2 Oct 2015 00:55:06 -0700
Subject: [PATCH] Bump docker-from-scratch to fix /dev/shm and /dev/mqueue

---
 Godeps/Godeps.json                                            | 4 ++--
 .../src/github.com/rancher/docker-from-scratch/scratch.go     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index b602b1ca..20fc0bf9 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -363,8 +363,8 @@
 		},
 		{
 			"ImportPath": "github.com/rancher/docker-from-scratch",
-			"Comment": "v1.8.2-1-2-g5852c65",
-			"Rev": "5852c65f66b6a5e850811dc9782d3b7400531fee"
+			"Comment": "v1.8.2-1-4-ge435c54",
+			"Rev": "e435c547350adb6b30a64ec1c072f27177b70288"
 		},
 		{
 			"ImportPath": "github.com/rancher/netconf",
diff --git a/Godeps/_workspace/src/github.com/rancher/docker-from-scratch/scratch.go b/Godeps/_workspace/src/github.com/rancher/docker-from-scratch/scratch.go
index e9f1c149..7319dafe 100644
--- a/Godeps/_workspace/src/github.com/rancher/docker-from-scratch/scratch.go
+++ b/Godeps/_workspace/src/github.com/rancher/docker-from-scratch/scratch.go
@@ -30,6 +30,8 @@ var (
 	mounts = [][]string{
 		{"devtmpfs", "/dev", "devtmpfs", ""},
 		{"none", "/dev/pts", "devpts", ""},
+		{"shm", "/dev/shm", "tmpfs", "rw,nosuid,nodev,noexec,relatime,size=65536k"},
+		{"mqueue", "/dev/mqueue", "mqueue", "rw,nosuid,nodev,noexec,relatime"},
 		{"none", "/proc", "proc", ""},
 		{"none", "/run", "tmpfs", ""},
 		{"none", "/sys", "sysfs", ""},