Explorar el Código

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 hace 11 años
padre
commit
8723a8a89e
Se han modificado 2 ficheros con 3 adiciones y 2 borrados
  1. 2 1
      container.go
  2. 1 1
      runtime.go

+ 2 - 1
container.go

@@ -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)
 	}

+ 1 - 1
runtime.go

@@ -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)
 }