do_lxcap_stop: wait until container is stopped

In the past, lxc-cmd-stop would wait until the command pipe was closed
before returning, ensuring that the container monitor had exited.
Now that we accept the actual success return value, lxcapi_stop can
return success before the monitor has fully exited.

So explicitly wait for the container to stop, when lxc-cmd-stop returned
success.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 08d788a7a2466a1a27e46493eaf8f5dbbcb2b363..c2a18f2cb6bca3b540c33091acdd05a1c75c9e7c 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -735,7 +735,10 @@ static bool lxcapi_stop(struct lxc_container *c)
 
        ret = lxc_cmd_stop(c->name, c->config_path);
 
-       return ret == 0;
+       if (ret == 0)
+               return do_lxcapi_wait(c, "STOPPED", 10);
+
+       return false;
 }
 
 static int do_create_container_dir(const char *path, struct lxc_conf *conf)