waitpid at abort to make sure we can rmdir cgroups

If we abort the container start, and don't wait for the init task to be reaped after we kill it, then we can't remove the container cgroup because it is not empty. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

waitpid at abort to make sure we can rmdir cgroups
73e608b2 · Serge Hallyn · 39dc698c · 73e608b2
Commit 73e608b2 authored May 30, 2013 by Serge Hallyn
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

start.c src/lxc/start.c +3 -0

No files found.
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -451,9 +451,12 @@ static void lxc_fini(const char *name, struct lxc_handler *handler)

 void lxc_abort(const char *name, struct lxc_handler *handler)
 {
+	int ret, status;
+
 	lxc_set_state(name, handler, ABORTING);
 	if (handler->pid > 0)
 		kill(handler->pid, SIGKILL);
+	while ((ret = waitpid(-1, &status, 0)) > 0) ;
 }

 #include <sys/reboot.h>