diff --git a/libcontainerd/supervisor/remote_daemon.go b/libcontainerd/supervisor/remote_daemon.go index 7138dc00a87e8..10a8a4fda77a9 100644 --- a/libcontainerd/supervisor/remote_daemon.go +++ b/libcontainerd/supervisor/remote_daemon.go @@ -190,12 +190,13 @@ func (r *remote) startContainerd() error { runtime.LockOSThread() defer runtime.UnlockOSThread() err := cmd.Start() - startedCh <- err if err != nil { + startedCh <- err return } - r.daemonWaitCh = make(chan struct{}) + startedCh <- nil + // Reap our child when needed if err := cmd.Wait(); err != nil { r.logger.WithError(err).Errorf("containerd did not exit successfully")