Browse code
Populate command in ghost state to pass to RestoreCommand
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Michael Crosby authored on 2014/01/21 11:43:54Showing 2 changed files
| ... | ... |
@@ -1122,7 +1122,8 @@ func (container *Container) monitor(callback execdriver.StartCallback) error {
|
| 1122 | 1122 |
|
| 1123 | 1123 |
if container.command == nil {
|
| 1124 | 1124 |
// This happends when you have a GHOST container with lxc |
| 1125 |
- err = container.runtime.WaitGhost(container) |
|
| 1125 |
+ populateCommand(container) |
|
| 1126 |
+ err = container.runtime.RestoreCommand(container) |
|
| 1126 | 1127 |
} else {
|
| 1127 | 1128 |
exitCode, err = container.runtime.Run(container, callback) |
| 1128 | 1129 |
} |
| ... | ... |
@@ -809,7 +809,7 @@ func (runtime *Runtime) Kill(c *Container, sig int) error {
|
| 809 | 809 |
return runtime.execDriver.Kill(c.command, sig) |
| 810 | 810 |
} |
| 811 | 811 |
|
| 812 |
-func (runtime *Runtime) WaitGhost(c *Container) error {
|
|
| 812 |
+func (runtime *Runtime) RestoreCommand(c *Container) error {
|
|
| 813 | 813 |
return runtime.execDriver.Restore(c.command) |
| 814 | 814 |
} |
| 815 | 815 |
|