Blame SOURCES/0188-Revert-core-one-step-back-again-for-nspawn-we-actual.patch

17b0f1
From 647a7761e2fa423c6e1bd6785b043dbe7b525e3c Mon Sep 17 00:00:00 2001
17b0f1
From: Lukas Nykryn <lnykryn@redhat.com>
17b0f1
Date: Thu, 25 Jun 2015 09:20:59 +0200
17b0f1
Subject: [PATCH] Revert "core: one step back again, for nspawn we actually
17b0f1
 can't wait for cgroups running empty since systemd will get exactly zero
17b0f1
 notifications about it"
17b0f1
17b0f1
This reverts commit 743970d2ea6d08aa7c7bff8220f6b7702f2b1db7.
17b0f1
17b0f1
RHEL-only
17b0f1
https://bugzilla.redhat.com/show_bug.cgi?id=1141137
17b0f1
https://github.com/systemd/systemd/pull/350
17b0f1
17b0f1
Resolves: #1199644
17b0f1
---
17b0f1
 src/core/unit.c | 10 +---------
17b0f1
 1 file changed, 1 insertion(+), 9 deletions(-)
17b0f1
17b0f1
diff --git a/src/core/unit.c b/src/core/unit.c
17b0f1
index b9e1f13eaf..fa17567dd3 100644
17b0f1
--- a/src/core/unit.c
17b0f1
+++ b/src/core/unit.c
17b0f1
@@ -3546,15 +3546,7 @@ int unit_kill_context(
17b0f1
                                 log_unit_warning_errno(u->id, r, "Failed to kill control group: %m");
17b0f1
                 } else if (r > 0) {
17b0f1
 
17b0f1
-                        /* FIXME: For now, we will not wait for the
17b0f1
-                         * cgroup members to die, simply because
17b0f1
-                         * cgroup notification is unreliable. It
17b0f1
-                         * doesn't work at all in containers, and
17b0f1
-                         * outside of containers it can be confused
17b0f1
-                         * easily by leaving directories in the
17b0f1
-                         * cgroup. */
17b0f1
-
17b0f1
-                        /* wait_for_exit = true; */
17b0f1
+                        wait_for_exit = true;
17b0f1
 
17b0f1
                         if (c->send_sighup && k != KILL_KILL) {
17b0f1
                                 set_free(pid_set);