From b2601c1b6388c30e9f6289746b95d525371e6b9f Mon Sep 17 00:00:00 2001 From: Fernando Date: Sat, 10 May 2014 18:05:02 -0400 Subject: [PATCH] Fix bug on LXC container start. Fixes #5718 Docker-DCO-1.1-Signed-off-by: Fernando Mayo (github: fermayo) Upstream-commit: 752c57ae567813f354aca66ff51d8d64100ae01b Component: engine --- components/engine/daemon/execdriver/lxc/driver.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/components/engine/daemon/execdriver/lxc/driver.go b/components/engine/daemon/execdriver/lxc/driver.go index d787d8d873..0b98176213 100644 --- a/components/engine/daemon/execdriver/lxc/driver.go +++ b/components/engine/daemon/execdriver/lxc/driver.go @@ -268,18 +268,14 @@ func (d *driver) waitForStart(c *execdriver.Command, waitLock chan struct{}) (in } output, err = d.getInfo(c.ID) - if err != nil { - output, err = d.getInfo(c.ID) + if err == nil { + info, err := parseLxcInfo(string(output)) if err != nil { return -1, err } - } - info, err := parseLxcInfo(string(output)) - if err != nil { - return -1, err - } - if info.Running { - return info.Pid, nil + if info.Running { + return info.Pid, nil + } } time.Sleep(50 * time.Millisecond) }