From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 7 Feb 2014 15:12:09 +0000 (+0100)
Subject: core: one step back again, for nspawn we actually can't wait for cgroups running... 
X-Git-Tag: v209~224
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=743970d2ea6d08aa7c7bff8220f6b7702f2b1db7;p=elogind.git

core: one step back again, for nspawn we actually can't wait for cgroups running empty since systemd will get exactly zero notifications about it
---

diff --git a/src/core/unit.c b/src/core/unit.c
index b0bb0260b..1a8fdcba3 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3103,7 +3103,15 @@ int unit_kill_context(
                                 log_warning_unit(u->id, "Failed to kill control group: %s", strerror(-r));
                 } else if (r > 0) {
 
-                        wait_for_exit = true;
+                        /* FIXME: For now, we will not wait for the
+                         * cgroup members to die, simply because
+                         * cgroup notification is unreliable. It
+                         * doesn't work at all in containers, and
+                         * outside of containers it can be confused
+                         * easily by leaving directories in the
+                         * cgroup. */
+
+                        /* wait_for_exit = true; */
 
                         if (c->send_sighup && !sigkill) {
                                 set_free(pid_set);