daandemeyer / rpms / systemd

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