anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

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

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