docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17808 from bboreham/ipc-errormsg 

Fix typo in container-start error message
This commit is contained in:
Vincent Demeester 2015-11-09 07:58:03 +01:00
parent c13ca529d3 93405dd037
commit 944dc7fa8f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/container_unix.go
View File

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