From f995725348228215e15459619babd44345f6cddbb47fbfb3e866185f17b25a6a Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Fri, 9 Mar 2018 09:56:29 +0000
Subject: [PATCH] Accepting request 584654 from home:fbui:systemd:Factory

- Remove dropin that was used to turn delegation off for user instances
  Upstream now enables "memory" and "pids" controllers only which
  should have a very limited impact on performance compare to the
  "cpu" controller.

- Import commit 46d6bc9c4f1c05f3b4fcfca754cc59963bd86ce3
  2a79f4e78 units: delegate "memory" instead of "cpu" by default for user instances (#8320) (bsc#954765 bnc#953241 fate#320421)
  88174ae85 compat-rules: fix syntax errors spotted by test/rule-syntax-check.py

OBS-URL: https://build.opensuse.org/request/show/584654
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1020
---
 systemd-237.tar.xz   |  4 ++--
 systemd-mini.changes | 17 +++++++++++++++++
 systemd-mini.spec    | 10 ----------
 systemd.changes      | 17 +++++++++++++++++
 systemd.spec         | 10 ----------
 5 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/systemd-237.tar.xz b/systemd-237.tar.xz
index 7f8d95f5..23ed3778 100644
--- a/systemd-237.tar.xz
+++ b/systemd-237.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db6382de9795d96b41a50ab2ac369b54ba49525181bc00a02ff67dfd970c59be
-size 4629324
+oid sha256:b420f2ff5841266d03c6691bd8adb705b2c46c391c33610923a23444232633f4
+size 4630076
diff --git a/systemd-mini.changes b/systemd-mini.changes
index 792bb192..9cbcfccd 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Mar  9 09:35:59 UTC 2018 - fbui@suse.com
+
+- Remove dropin that was used to turn delegation off for user instances
+
+  Upstream now enables "memory" and "pids" controllers only which
+  should have a very limited impact on performance compare to the
+  "cpu" controller.
+
+-------------------------------------------------------------------
+Fri Mar  9 09:30:14 UTC 2018 - fbui@suse.com
+
+- Import commit 46d6bc9c4f1c05f3b4fcfca754cc59963bd86ce3
+
+  2a79f4e78 units: delegate "memory" instead of "cpu" by default for user instances (#8320) (bsc#954765 bnc#953241 fate#320421)
+  88174ae85 compat-rules: fix syntax errors spotted by test/rule-syntax-check.py
+
 -------------------------------------------------------------------
 Thu Mar  8 15:22:10 UTC 2018 - fbui@suse.com
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 4c7a162a..bcd65347 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -612,14 +612,6 @@ cat << EOF > %{buildroot}%{_unitdir}/getty@tty1.service.d/noclear.conf
 TTYVTDisallocate=no
 EOF
 
-# create drop-in to prevent delegate=yes for root user (bsc#954765,
-# bnc#953241, fate#320421)
-mkdir -p %{buildroot}%{_unitdir}/user@0.service.d/
-cat >%{buildroot}%{_unitdir}/user@0.service.d/nodelagate.conf <<EOF
-[Service]
-Delegate=no
-EOF
-
 # ensure after.local wrapper is called
 install -m 644 %{S:11} %{buildroot}%{_unitdir}/
 ln -s ../after-local.service %{buildroot}%{_unitdir}/multi-user.target.wants/
@@ -964,9 +956,7 @@ fi
 %dir %{_prefix}/lib/systemd/system-shutdown/
 %dir %{_prefix}/lib/systemd/system-sleep/
 %dir %{_unitdir}/getty@tty1.service.d
-%dir %{_unitdir}/user@0.service.d
 %{_unitdir}/getty@tty1.service.d/noclear.conf
-%{_unitdir}/user@0.service.d/nodelagate.conf
 /%{_lib}/security/pam_systemd.so
 
 %if %{with gnuefi}
diff --git a/systemd.changes b/systemd.changes
index 792bb192..9cbcfccd 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Mar  9 09:35:59 UTC 2018 - fbui@suse.com
+
+- Remove dropin that was used to turn delegation off for user instances
+
+  Upstream now enables "memory" and "pids" controllers only which
+  should have a very limited impact on performance compare to the
+  "cpu" controller.
+
+-------------------------------------------------------------------
+Fri Mar  9 09:30:14 UTC 2018 - fbui@suse.com
+
+- Import commit 46d6bc9c4f1c05f3b4fcfca754cc59963bd86ce3
+
+  2a79f4e78 units: delegate "memory" instead of "cpu" by default for user instances (#8320) (bsc#954765 bnc#953241 fate#320421)
+  88174ae85 compat-rules: fix syntax errors spotted by test/rule-syntax-check.py
+
 -------------------------------------------------------------------
 Thu Mar  8 15:22:10 UTC 2018 - fbui@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index 0467db3a..3520a0b2 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -610,14 +610,6 @@ cat << EOF > %{buildroot}%{_unitdir}/getty@tty1.service.d/noclear.conf
 TTYVTDisallocate=no
 EOF
 
-# create drop-in to prevent delegate=yes for root user (bsc#954765,
-# bnc#953241, fate#320421)
-mkdir -p %{buildroot}%{_unitdir}/user@0.service.d/
-cat >%{buildroot}%{_unitdir}/user@0.service.d/nodelagate.conf <<EOF
-[Service]
-Delegate=no
-EOF
-
 # ensure after.local wrapper is called
 install -m 644 %{S:11} %{buildroot}%{_unitdir}/
 ln -s ../after-local.service %{buildroot}%{_unitdir}/multi-user.target.wants/
@@ -962,9 +954,7 @@ fi
 %dir %{_prefix}/lib/systemd/system-shutdown/
 %dir %{_prefix}/lib/systemd/system-sleep/
 %dir %{_unitdir}/getty@tty1.service.d
-%dir %{_unitdir}/user@0.service.d
 %{_unitdir}/getty@tty1.service.d/noclear.conf
-%{_unitdir}/user@0.service.d/nodelagate.conf
 /%{_lib}/security/pam_systemd.so
 
 %if %{with gnuefi}