Commit 00aaecd7 authored by Martin Pitt's avatar Martin Pitt

Revert upstream commit 743970d2 which immediately SIGKILLs units during shutdown

This leads to problems like bash not being able to write its history, mosh not
saving its state, and similar failed cleanup actions.

LP: #1448259
parent c7e798f8
systemd (215-18) UNRELEASED; urgency=medium
[ Michael Biebl ]
* manager: Pass correct errno to strerror(), have_ask_password contains
negative error values which have to be negated when being passed to
strerror().
[ Martin Pitt ]
* Revert upstream commit 743970d which immediately SIGKILLs units during
shutdown. This leads to problems like bash not being able to write its
history, mosh not saving its state, and similar failed cleanup actions.
(Closes: #784720, LP: #1448259)
-- Michael Biebl <biebl@debian.org> Fri, 17 Apr 2015 15:40:29 +0200
systemd (215-17) unstable; urgency=high
......
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Mon, 27 Apr 2015 15:29:13 +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.
Bug-Debian: https://bugs.debian.org/784720
Bug-Ubuntu: https://launchpad.net/bugs/1448259
Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1141137
---
src/core/unit.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/core/unit.c b/src/core/unit.c
index 536fd5e..d82d5d1 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3218,15 +3218,7 @@ int unit_kill_context(
log_warning_unit(u->id, "Failed to kill control group: %s", strerror(-r));
} else if (r > 0) {
- /* 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; */
+ wait_for_exit = true;
if (c->send_sighup && !sigkill) {
set_free(pid_set);
......@@ -206,3 +206,4 @@ sysv-generator-add-support-for-etc-insserv-overrides.patch
syslog-Increase-max_dgram_qlen-by-pulling-in-systemd.patch
Skip-filesystem-check-if-already-done-by-the-initram.patch
cryptsetup-Implement-offset-and-skip-options.patch
Revert-core-one-step-back-again-for-nspawn-we-actual.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment