From 8bc8b495f87464799ae978ee6058fa542a69b2a5 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Sep 22 2019 17:03:16 +0000 Subject: Fix for bug 16438 --- diff --git a/SOURCES/9900-core-exclude-.slice-units-from-systemctl-isolate.patch b/SOURCES/9900-core-exclude-.slice-units-from-systemctl-isolate.patch new file mode 100644 index 0000000..2fac114 --- /dev/null +++ b/SOURCES/9900-core-exclude-.slice-units-from-systemctl-isolate.patch @@ -0,0 +1,42 @@ +From e3f4788affdee67e8afaea18d06d63b82a03d6e7 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Thu, 18 Feb 2016 22:51:23 +0100 +Subject: [PATCH 1/2] core: exclude .slice units from "systemctl isolate" + +Fixes: #1969 +(cherry picked from commit 1b4cd0cf11feb7d41f2eff17f86fa55b31bb6841) + +Resolves: #1745199 +--- + src/core/slice.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/core/slice.c b/src/core/slice.c +index 0985a65..b076920 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, +-- +1.8.3.1 + diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec index b424f9e..b7a5d74 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}.1.0.1 # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -798,6 +798,8 @@ 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 +# https://github.com/systemd-rhel/rhel-7/pull/38.patch +Patch9900: 9900-core-exclude-.slice-units-from-systemctl-isolate.patch Patch9999: 9999-Update-kernel-install-script-by-backporting-fedora-p.patch %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);} @@ -1775,6 +1777,10 @@ fi %{_mandir}/man8/systemd-resolved.* %changelog +* Fri Sep 20 2019 Tru Huynh - bz1745199 +- https://bugzilla.redhat.com/show_bug.cgi?id=1745199 +- https://github.com/systemd-rhel/rhel-7/pull/38/commits/3a3c7374893751d2974cbb1b05dfbf71b49df590 + * Fri Jul 12 2019 Lukas Nykryn - 219-67.1 - return error value on failure (#1729226) - revert local changes made during backport of the test (#1729226)