From 3c1ccdf9a774de405ada5e4d46d3e844e66ea511 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Thu, 25 Jun 2015 09:20:59 +0200 Subject: Revert "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" This reverts commit 743970d2ea6d08aa7c7bff8220f6b7702f2b1db7. RHEL-only https://bugzilla.redhat.com/show_bug.cgi?id=1141137 https://github.com/systemd/systemd/pull/350 Resolves: #1705379 --- src/core/unit.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/core/unit.c b/src/core/unit.c index cc43ddc4f1..d298afb0d4 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -4579,16 +4579,7 @@ int unit_kill_context( } else if (r > 0) { - /* FIXME: For now, on the legacy hierarchy, we will not wait for the cgroup members to die if - * we are running in a container or if this is a delegation unit, simply because cgroup - * notification is unreliable in these cases. It doesn't work at all in containers, and outside - * of containers it can be confused easily by left-over directories in the cgroup — which - * however should not exist in non-delegated units. On the unified hierarchy that's different, - * there we get proper events. Hence rely on them. */ - - if (cg_unified_controller(SYSTEMD_CGROUP_CONTROLLER) > 0 || - (detect_container() == 0 && !unit_cgroup_delegate(u))) - wait_for_exit = true; + wait_for_exit = true; if (send_sighup) { set_free(pid_set); -- cgit v1.2.1