Browse code

Fix bug on LXC container start. Fixes #5718 Docker-DCO-1.1-Signed-off-by: Fernando Mayo <fernando@tutum.co> (github: fermayo)

Fernando authored on 2014/05/11 07:05:02
Showing 1 changed files
... ...
@@ -268,18 +268,14 @@ func (d *driver) waitForStart(c *execdriver.Command, waitLock chan struct{}) (in
268 268
 		}
269 269
 
270 270
 		output, err = d.getInfo(c.ID)
271
-		if err != nil {
272
-			output, err = d.getInfo(c.ID)
271
+		if err == nil {
272
+			info, err := parseLxcInfo(string(output))
273 273
 			if err != nil {
274 274
 				return -1, err
275 275
 			}
276
-		}
277
-		info, err := parseLxcInfo(string(output))
278
-		if err != nil {
279
-			return -1, err
280
-		}
281
-		if info.Running {
282
-			return info.Pid, nil
276
+			if info.Running {
277
+				return info.Pid, nil
278
+			}
283 279
 		}
284 280
 		time.Sleep(50 * time.Millisecond)
285 281
 	}