From 319c5afe9a77551275f6b0bb2211480ad835eb44 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 18 2019 16:44:07 +0000
Subject: import systemd-239-13.el8_0.5


---

diff --git a/SOURCES/0095-Revert-core-one-step-back-again-for-nspawn-we-actual.patch b/SOURCES/0095-Revert-core-one-step-back-again-for-nspawn-we-actual.patch
new file mode 100644
index 0000000..66c6440
--- /dev/null
+++ b/SOURCES/0095-Revert-core-one-step-back-again-for-nspawn-we-actual.patch
@@ -0,0 +1,40 @@
+From 3c1ccdf9a774de405ada5e4d46d3e844e66ea511 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Thu, 25 Jun 2015 09:20:59 +0200
+Subject: [PATCH] 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.
+
+RHEL-only
+https://bugzilla.redhat.com/show_bug.cgi?id=1141137
+https://github.com/systemd/systemd/pull/350
+
+Resolves: #1705379
+---
+ src/core/unit.c | 11 +----------
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+
+diff --git a/src/core/unit.c b/src/core/unit.c
+index cc43ddc4f..d298afb0d 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -4579,16 +4579,7 @@ int unit_kill_context(
+ 
+                 } else if (r > 0) {
+ 
+-                        /* FIXME: For now, on the legacy hierarchy, we will not wait for the cgroup members to die if
+-                         * we are running in a container or if this is a delegation unit, simply because cgroup
+-                         * notification is unreliable in these cases. It doesn't work at all in containers, and outside
+-                         * of containers it can be confused easily by left-over directories in the cgroup — which
+-                         * however should not exist in non-delegated units. On the unified hierarchy that's different,
+-                         * there we get proper events. Hence rely on them. */
+-
+-                        if (cg_unified_controller(SYSTEMD_CGROUP_CONTROLLER) > 0 ||
+-                            (detect_container() == 0 && !unit_cgroup_delegate(u)))
+-                                wait_for_exit = true;
++                        wait_for_exit = true;
+ 
+                         if (send_sighup) {
+                                 set_free(pid_set);
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index ae8d934..cc816d2 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -13,7 +13,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        239
-Release:        13%{?dist}.3
+Release:        13%{?dist}.5
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        System and Service Manager
@@ -144,6 +144,7 @@ Patch0091: 0091-bus-socket-Fix-line_begins-to-accept-word-matching-f.patch
 Patch0092: 0092-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
 Patch0093: 0093-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
 Patch0094: 0094-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
+Patch0095: 0095-Revert-core-one-step-back-again-for-nspawn-we-actual.patch
 
 
 %ifarch %{ix86} x86_64 aarch64
@@ -763,6 +764,12 @@ fi
 %files tests -f .file-list-tests
 
 %changelog
+* Thu May 02 2019 Lukas Nykryn <lnykryn@redhat.com> - 239-13.5
+- rebuilt
+
+* Thu May 02 2019 Lukas Nykryn <lnykryn@redhat.com> - 239-13.4
+- 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" (#1705379)
+
 * Tue Apr 09 2019 Lukas Nykryn <lnykryn@redhat.com> - 239-13.3
 - rebuilt