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

Populate command in ghost state to pass to RestoreCommand

Browse Source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8723a8a89ec7d5b2a37e0536d7aadd78e5329773
Component: engine
This commit is contained in:
Michael Crosby
2014-01-20 18:43:54 -08:00
committed by Guillaume J. Charmes
parent b038ed039d
commit 96dad4beb8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/container.go
View File

@ -1122,7 +1122,8 @@ func (container *Container) monitor(callback execdriver.StartCallback) error {
if container.command == nil {
// This happends when you have a GHOST container with lxc
err = container.runtime.WaitGhost(container)
populateCommand(container)
err = container.runtime.RestoreCommand(container)
} else {
exitCode, err = container.runtime.Run(container, callback)
}

2
components/engine/runtime.go
View File

@ -809,7 +809,7 @@ func (runtime *Runtime) Kill(c *Container, sig int) error {
return runtime.execDriver.Kill(c.command, sig)
}
func (runtime *Runtime) WaitGhost(c *Container) error {
func (runtime *Runtime) RestoreCommand(c *Container) error {
return runtime.execDriver.Restore(c.command)
}