p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16992 from burke/fix-mqueue

Browse Source 
Fix --ipc=host dependency on /dev/mqueue existing
Upstream-commit: 678acbcb3fc370e31f677c71a5f8615f2ad3a353
Component: engine
This commit is contained in:
David Calavera
2015-10-21 11:25:37 -07:00
parent 4a8a97b06e 5ff41583d8
commit 77ceb17e18
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/daemon/container_unix.go
View File

@ -218,6 +218,12 @@ func populateCommand(c *Container, env []string) error {
} else {
ipc.HostIpc = c.hostConfig.IpcMode.IsHost()
if ipc.HostIpc {
if _, err := os.Stat("/dev/shm"); err != nil {
return fmt.Errorf("/dev/shm is not mounted, but must be for --host=ipc")
}
if _, err := os.Stat("/dev/mqueue"); err != nil {
return fmt.Errorf("/dev/mqueue is not mounted, but must be for --host=ipc")
}
c.ShmPath = "/dev/shm"
c.MqueuePath = "/dev/mqueue"
}