gistfile1.diff

luke@demos:~/Projects/docker$ git diff
diff --git a/daemon/container.go b/daemon/container.go
index 32d69f1..b1d004d 100644
--- a/daemon/container.go
+++ b/daemon/container.go
@@ -340,6 +340,8 @@ func (container *Container) Start() (err error) {
                }
        }()
 
+       container.monitor = newContainerMonitor(container, container.hostConfig.RestartPolicy)
+
        if err := container.setupContainerDns(); err != nil {
                return err
        }
@@ -1322,7 +1324,6 @@ func (container *Container) startLoggingToDisk() error {
 }
 
 func (container *Container) waitForStart() error {
-       container.monitor = newContainerMonitor(container, container.hostConfig.RestartPolicy)
 
        // block until we either receive an error from the initial start of the container's
        // process or until the process is running in the container