From 743970d2ea6d08aa7c7bff8220f6b7702f2b1db7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 7 Feb 2014 16:12:09 +0100 Subject: [PATCH] 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 --- src/core/unit.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/core/unit.c b/src/core/unit.c index b0bb0260b..1a8fdcba3 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -3103,7 +3103,15 @@ int unit_kill_context( log_warning_unit(u->id, "Failed to kill control group: %s", strerror(-r)); } else if (r > 0) { - wait_for_exit = true; + /* FIXME: For now, we will not wait for the + * cgroup members to die, simply because + * cgroup notification is unreliable. It + * doesn't work at all in containers, and + * outside of containers it can be confused + * easily by leaving directories in the + * cgroup. */ + + /* wait_for_exit = true; */ if (c->send_sighup && !sigkill) { set_free(pid_set); -- 2.30.2