fb7efb
From cd12ff2291f5bd529a8d83bb76726194d3daaf13 Mon Sep 17 00:00:00 2001
fb7efb
From: Michal Sekletar <msekleta@redhat.com>
fb7efb
Date: Thu, 24 Sep 2015 22:25:43 +0200
fb7efb
Subject: [PATCH 46/47] Revert "core: one step back again, for nspawn we
fb7efb
 actually can't wait for cgroups running empty since systemd will get exactly
fb7efb
 zero notifications about it"
fb7efb
fb7efb
This reverts commit 743970d2ea6d08aa7c7bff8220f6b7702f2b1db7.
fb7efb
---
fb7efb
 src/core/unit.c | 10 +---------
fb7efb
 1 file changed, 1 insertion(+), 9 deletions(-)
fb7efb
fb7efb
diff --git a/src/core/unit.c b/src/core/unit.c
fb7efb
index 0a66a6a..db0fca0 100644
fb7efb
--- a/src/core/unit.c
fb7efb
+++ b/src/core/unit.c
fb7efb
@@ -3557,15 +3557,7 @@ int unit_kill_context(
fb7efb
                                 log_unit_warning_errno(u, r, "Failed to kill control group: %m");
fb7efb
                 } else if (r > 0) {
fb7efb
 
fb7efb
-                        /* FIXME: For now, we will not wait for the
fb7efb
-                         * cgroup members to die, simply because
fb7efb
-                         * cgroup notification is unreliable. It
fb7efb
-                         * doesn't work at all in containers, and
fb7efb
-                         * outside of containers it can be confused
fb7efb
-                         * easily by leaving directories in the
fb7efb
-                         * cgroup. */
fb7efb
-
fb7efb
-                        /* wait_for_exit = true; */
fb7efb
+                        wait_for_exit = true;
fb7efb
 
fb7efb
                         if (c->send_sighup && k != KILL_KILL) {
fb7efb
                                 set_free(pid_set);
fb7efb
-- 
fb7efb
2.5.0
fb7efb