From 3533012ae242fe407caf665b7a5fcb522239fd8f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 15 2019 14:37:39 +0000
Subject: import systemd-219-67.el7_7.2


---

diff --git a/SOURCES/0759-core-exclude-.slice-units-from-systemctl-isolate.patch b/SOURCES/0759-core-exclude-.slice-units-from-systemctl-isolate.patch
new file mode 100644
index 0000000..b315f81
--- /dev/null
+++ b/SOURCES/0759-core-exclude-.slice-units-from-systemctl-isolate.patch
@@ -0,0 +1,39 @@
+From 7230c4c85173a100f1cc484485fe87d79622cb91 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Thu, 18 Feb 2016 22:51:23 +0100
+Subject: [PATCH] core: exclude .slice units from "systemctl isolate"
+
+Fixes: #1969
+(cherry picked from commit 1b4cd0cf11feb7d41f2eff17f86fa55b31bb6841)
+
+Resolves: #1751130
+---
+ src/core/slice.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/core/slice.c b/src/core/slice.c
+index 0985a65286..b0769205f6 100644
+--- a/src/core/slice.c
++++ b/src/core/slice.c
+@@ -36,6 +36,13 @@ static const UnitActiveState state_translation_table[_SLICE_STATE_MAX] = {
+         [SLICE_ACTIVE] = UNIT_ACTIVE
+ };
+ 
++static void slice_init(Unit *u) {
++        assert(u);
++        assert(u->load_state == UNIT_STUB);
++
++        u->ignore_on_isolate = true;
++}
++
+ static void slice_set_state(Slice *t, SliceState state) {
+         SliceState old_state;
+         assert(t);
+@@ -274,6 +281,7 @@ const UnitVTable slice_vtable = {
+         .no_instances = true,
+         .can_transient = true,
+ 
++        .init = slice_init,
+         .load = slice_load,
+ 
+         .coldplug = slice_coldplug,
diff --git a/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch b/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch
deleted file mode 100644
index c42f0b6..0000000
--- a/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From c49c37d5e26bf71a97d5194d390f80d3e71758e1 Mon Sep 17 00:00:00 2001
-From: systemd team <systemd-maint@redhat.com>
-Date: Tue, 23 Apr 2019 10:46:19 -0300
-Subject: [PATCH] Update kernel-install script by backporting fedora patches
-
----
- src/kernel-install/kernel-install | 30 +++++++++++++++++-------------
- 1 file changed, 17 insertions(+), 13 deletions(-)
-
-diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install
-index f1c74de..d860701 100755
---- a/src/kernel-install/kernel-install
-+++ b/src/kernel-install/kernel-install
-@@ -73,23 +73,27 @@ KERNEL_IMAGE="$2"
- 
- if [[ -x /sbin/new-kernel-pkg ]]; then
-     KERNEL_DIR="${KERNEL_IMAGE%/*}"
--    if [[ "${KERNEL_DIR}" != "/boot" ]]; then
--        for i in \
--            "$KERNEL_IMAGE" \
--            "$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac" \
--            "$KERNEL_DIR"/System.map \
--            "$KERNEL_DIR"/config \
--            "$KERNEL_DIR"/zImage.stub \
--            "$KERNEL_DIR"/dtb \
--            ; do
--            [[ -e "$i" ]] || continue
--            cp -a "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
--        done
--    fi
- 
-     [[ "$KERNEL_VERSION" == *\+* ]] && flavor=-"${KERNEL_VERSION##*+}"
-     case "$COMMAND" in
-         add)
-+            if [[ "${KERNEL_DIR}" != "/boot" ]]; then
-+                for i in \
-+                    "$KERNEL_IMAGE" \
-+                    "$KERNEL_DIR"/System.map \
-+                    "$KERNEL_DIR"/config \
-+                    "$KERNEL_DIR"/zImage.stub \
-+                    "$KERNEL_DIR"/dtb \
-+                    ; do
-+                    [[ -e "$i" ]] || continue
-+                    cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
-+                done
-+                # hmac is .vmlinuz-<version>.hmac so needs a special treatment
-+                i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
-+                if [[ -e "$i" ]]; then
-+                    cp -aT "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
-+                fi
-+            fi
-             /sbin/new-kernel-pkg --package "kernel${flavor}" --install "$KERNEL_VERSION" || exit $?
-             /sbin/new-kernel-pkg --package "kernel${flavor}" --mkinitrd --dracut --depmod --update "$KERNEL_VERSION" || exit $?
-             /sbin/new-kernel-pkg --package "kernel${flavor}" --rpmposttrans "$KERNEL_VERSION" || exit $?
--- 
-1.8.3.1
-
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index b424f9e..a446e0b 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -7,7 +7,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        219
-Release:        67%{?dist}.1
+Release:        67%{?dist}.2
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -797,8 +797,7 @@ Patch0755: 0755-pid1-free-basic-unit-information-at-the-very-end-bef.patch
 Patch0756: 0756-pid1-properly-remove-references-to-the-unit-from-gc-.patch
 Patch0757: 0757-service-relax-PID-file-symlink-chain-checks-a-bit-81.patch
 Patch0758: 0758-path-util-fix-more-path_is_mount-e792e890f-fallout.patch
-
-Patch9999: 9999-Update-kernel-install-script-by-backporting-fedora-p.patch
+Patch0759: 0759-core-exclude-.slice-units-from-systemctl-isolate.patch
 
 %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
 
@@ -1775,6 +1774,9 @@ fi
 %{_mandir}/man8/systemd-resolved.*
 
 %changelog
+* Thu Sep 19 2019 David Tardon <dtardon@redhat.com> - 219-67.2
+- core: exclude .slice units from "systemctl isolate" (#1751130)
+
 * Fri Jul 12 2019 Lukas Nykryn <lnykryn@redhat.com> - 219-67.1
 - return error value on failure (#1729226)
 - revert local changes made during backport of the test (#1729226)