Commit 28640752 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 f37eae7d
systemd (219-7ubuntu5) UNRELEASED; urgency=medium
* 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.
(LP: #1448259)
-- Martin Pitt <martin.pitt@ubuntu.com> Mon, 27 Apr 2015 15:12:56 +0200
systemd (219-7ubuntu4) vivid; urgency=medium
* hwdb: Fix wireless switch on Dell Latitude (LP: #1441849)
......
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.
---
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 93487d8..1ddd105 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3542,15 +3542,7 @@ int unit_kill_context(
log_unit_warning_errno(u->id, r, "Failed to kill control group: %m");
} 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 && k != KILL_KILL) {
set_free(pid_set);
......@@ -66,6 +66,7 @@ syslog-Increase-max_dgram_qlen-by-pulling-in-systemd.patch
fsckd-daemon-for-inter-fsckd-communication.patch
Add-fsckd-po-files.patch
cryptsetup-Implement-offset-and-skip-options.patch
Revert-core-one-step-back-again-for-nspawn-we-actual.patch
## Ubuntu patches:
Support-system-image-read-only-etc.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