From c77d1939216023abf496e30725f47787e183b1d4 Mon Sep 17 00:00:00 2001
From: Burke Libbey <burke@libbey.me>
Date: Tue, 13 Oct 2015 17:46:55 -0400
Subject: [PATCH] Fix --ipc=host dependency on /dev/mqueue existing

Since #15862, containers fail to start when started with --ipc=host if
/dev/mqueue is not present. This change causes docker to create
container-local mounts for --ipc=host containers as well as in the
default case.

Signed-off-by: Burke Libbey <burke.libbey@shopify.com>
Upstream-commit: f624d6187a8daa3ca0999c46cb345f8db6f330e7
Component: engine
---
 components/engine/daemon/container.go      | 2 +-
 components/engine/daemon/container_unix.go | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/components/engine/daemon/container.go b/components/engine/daemon/container.go
index 53807f90e6..b31c40bd88 100644
--- a/components/engine/daemon/container.go
+++ b/components/engine/daemon/container.go
@@ -288,7 +288,7 @@ func (container *Container) Start() (err error) {
 		return err
 	}
 
-	if !container.hostConfig.IpcMode.IsContainer() && !container.hostConfig.IpcMode.IsHost() {
+	if !container.hostConfig.IpcMode.IsContainer() {
 		if err := container.setupIpcDirs(); err != nil {
 			return err
 		}
diff --git a/components/engine/daemon/container_unix.go b/components/engine/daemon/container_unix.go
index a31fde6f78..b6ed72b923 100644
--- a/components/engine/daemon/container_unix.go
+++ b/components/engine/daemon/container_unix.go
@@ -214,12 +214,6 @@ func populateCommand(c *Container, env []string) error {
 		ipc.ContainerID = ic.ID
 		c.ShmPath = ic.ShmPath
 		c.MqueuePath = ic.MqueuePath
-	} else {
-		ipc.HostIpc = c.hostConfig.IpcMode.IsHost()
-		if ipc.HostIpc {
-			c.ShmPath = "/dev/shm"
-			c.MqueuePath = "/dev/mqueue"
-		}
 	}
 
 	pid := &execdriver.Pid{}
@@ -1408,7 +1402,7 @@ func (container *Container) setupIpcDirs() error {
 }
 
 func (container *Container) unmountIpcMounts() error {
-	if container.hostConfig.IpcMode.IsContainer() || container.hostConfig.IpcMode.IsHost() {
+	if container.hostConfig.IpcMode.IsContainer() {
 		return nil
 	}