@@ -135,6 +135,9 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {

 	if err := eng.Register("restart", daemon.ContainerRestart); err != nil {

 		return err

 	}

+	if err := eng.Register("wait", daemon.ContainerWait); err != nil {

+		return err

+	}

 	return nil

 }

new file mode 100644

@@ -0,0 +1,20 @@

+package daemon

+

+import (

+	"time"

+

+	"github.com/docker/docker/engine"

+)

+

+func (daemon *Daemon) ContainerWait(job *engine.Job) engine.Status {

+	if len(job.Args) != 1 {

+		return job.Errorf("Usage: %s", job.Name)

+	}

+	name := job.Args[0]

+	if container := daemon.Get(name); container != nil {

+		status, _ := container.State.WaitStop(-1 * time.Second)

+		job.Printf("%d\n", status)

+		return engine.StatusOK

+	}

+	return job.Errorf("%s: no such container: %s", job.Name, name)

+}

@@ -386,19 +386,6 @@ func (srv *Server) ContainerDestroy(job *engine.Job) engine.Status {

 	return engine.StatusOK

 }

-func (srv *Server) ContainerWait(job *engine.Job) engine.Status {

-	if len(job.Args) != 1 {

-		return job.Errorf("Usage: %s", job.Name)

-	}

-	name := job.Args[0]

-	if container := srv.daemon.Get(name); container != nil {

-		status, _ := container.State.WaitStop(-1 * time.Second)

-		job.Printf("%d\n", status)

-		return engine.StatusOK

-	}

-	return job.Errorf("%s: no such container: %s", job.Name, name)

-}

-

 func (srv *Server) ContainerResize(job *engine.Job) engine.Status {

 	if len(job.Args) != 3 {

 		return job.Errorf("Not enough arguments. Usage: %s CONTAINER HEIGHT WIDTH\n", job.Name)

@@ -86,7 +86,6 @@ func InitServer(job *engine.Job) engine.Status {

 	job.Eng.Hack_SetGlobalVar("httpapi.daemon", srv.daemon)

 	for name, handler := range map[string]engine.Handler{

-		"wait":             srv.ContainerWait,

 		"tag":              srv.ImageTag, // FIXME merge with "image_tag"

 		"resize":           srv.ContainerResize,

 		"commit":           srv.ContainerCommit,