summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-02-07 16:12:09 +0100
committerLennart Poettering <lennart@poettering.net>2014-02-07 16:18:16 +0100
commit743970d2ea6d08aa7c7bff8220f6b7702f2b1db7 (patch)
treeb25e836d726066a9a44f67148831b647c04ef836
parent4e05c4951aaaa57c9c6f3fb91723e7b93b1bbbda (diff)
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
-rw-r--r--src/core/unit.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/unit.c b/src/core/unit.c
index b0bb0260bc..1a8fdcba34 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);