@@ -44,7 +44,6 @@ type Container struct {

 	HostnamePath    string

 	HostsPath       string

 	ShmPath         string

-	MqueuePath      string

 	ResolvConfPath  string

 	SeccompProfile  string

 }

@@ -549,15 +548,6 @@ func (container *Container) IpcMounts() []execdriver.Mount {

 			Propagation: volume.DefaultPropagationMode,

 		})

 	}

-	if !container.HasMountFor("/dev/mqueue") &&

-		container.MqueuePath != "" {

-		mounts = append(mounts, execdriver.Mount{

-			Source:      container.MqueuePath,

-			Destination: "/dev/mqueue",

-			Writable:    true,

-			Propagation: volume.DefaultPropagationMode,

-		})

-	}

 	return mounts

 }

@@ -106,11 +106,7 @@ func (daemon *Daemon) populateCommand(c *container.Container, env []string) erro

 			if _, err := os.Stat("/dev/shm"); err != nil {

 				return fmt.Errorf("/dev/shm is not mounted, but must be for --ipc=host")

 			}

-			if _, err := os.Stat("/dev/mqueue"); err != nil {

-				return fmt.Errorf("/dev/mqueue is not mounted, but must be for --ipc=host")

-			}

 			c.ShmPath = "/dev/shm"

-			c.MqueuePath = "/dev/mqueue"

 		}

 	}

@@ -2371,7 +2371,7 @@ func (s *DockerSuite) TestRunModeIpcContainer(c *check.C) {

 	// Not applicable on Windows as uses Unix-specific capabilities

 	testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)

-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", "echo -n test > /dev/shm/test && top")

+	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", "echo -n test > /dev/shm/test && touch /dev/mqueue/toto && top")

 	id := strings.TrimSpace(out)

 	state := inspectField(c, id, "State.Running")

@@ -2395,6 +2395,18 @@ func (s *DockerSuite) TestRunModeIpcContainer(c *check.C) {

 	if catOutput != "test" {

 		c.Fatalf("Output of /dev/shm/test expected test but found: %s", catOutput)

 	}

+

+	// check that /dev/mqueue is actually of mqueue type

+	grepOutput, _ := dockerCmd(c, "run", fmt.Sprintf("--ipc=container:%s", id), "busybox", "grep", "/dev/mqueue", "/proc/mounts")

+	if !strings.HasPrefix(grepOutput, "mqueue /dev/mqueue mqueue rw") {

+		c.Fatalf("Output of 'grep /proc/mounts' expected 'mqueue /dev/mqueue mqueue rw' but found: %s", grepOutput)

+	}

+

+	lsOutput, _ := dockerCmd(c, "run", fmt.Sprintf("--ipc=container:%s", id), "busybox", "ls", "/dev/mqueue")

+	lsOutput = strings.Trim(lsOutput, "\n")

+	if lsOutput != "toto" {

+		c.Fatalf("Output of 'ls /dev/mqueue' expected 'toto' but found: %s", lsOutput)

+	}

 }

 func (s *DockerSuite) TestRunModeIpcContainerNotExists(c *check.C) {

@@ -2421,9 +2433,11 @@ func (s *DockerSuite) TestRunModeIpcContainerNotRunning(c *check.C) {

 func (s *DockerSuite) TestRunMountShmMqueueFromHost(c *check.C) {

 	// Not applicable on Windows as uses Unix-specific capabilities

-	testRequires(c, SameHostDaemon, DaemonIsLinux)

+	testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)

-	dockerCmd(c, "run", "-d", "--name", "shmfromhost", "-v", "/dev/shm:/dev/shm", "busybox", "sh", "-c", "echo -n test > /dev/shm/test && top")

+	dockerCmd(c, "run", "-d", "--name", "shmfromhost", "-v", "/dev/shm:/dev/shm", "-v", "/dev/mqueue:/dev/mqueue", "busybox", "sh", "-c", "echo -n test > /dev/shm/test && touch /dev/mqueue/toto && top")

+	defer os.Remove("/dev/mqueue/toto")

+	defer os.Remove("/dev/shm/test")

 	volPath, err := inspectMountSourceField("shmfromhost", "/dev/shm")

 	c.Assert(err, checker.IsNil)

 	if volPath != "/dev/shm" {

@@ -2434,6 +2448,11 @@ func (s *DockerSuite) TestRunMountShmMqueueFromHost(c *check.C) {

 	if out != "test" {

 		c.Fatalf("Output of /dev/shm/test expected test but found: %s", out)

 	}

+

+	// Check that the mq was created

+	if _, err := os.Stat("/dev/mqueue/toto"); err != nil {

+		c.Fatalf("Failed to confirm '/dev/mqueue/toto' presence on host: %s", err.Error())

+	}

 }

 func (s *DockerSuite) TestContainerNetworkMode(c *check.C) {