chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4e05c49
)
core: one step back again, for nspawn we actually can't wait for cgroups running...
author
Lennart Poettering
<lennart@poettering.net>
Fri, 7 Feb 2014 15:12:09 +0000
(16:12 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 7 Feb 2014 15:18:16 +0000
(16:18 +0100)
src/core/unit.c
patch
|
blob
|
history
diff --git
a/src/core/unit.c
b/src/core/unit.c
index b0bb0260bcbec7f3f5a9ff1f80bee4a3e4d058c4..1a8fdcba343a16a22b5c417dfe3c7b902f51b44e 100644
(file)
--- 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) {
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);
if (c->send_sighup && !sigkill) {
set_free(pid_set);