From 0c3fbe50ef2720870228ba4815b0a7edb4ac54e94f932a916e84e68324151f25 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Wed, 15 Apr 2020 19:27:08 +0000
Subject: [PATCH] Accepting request 794368 from
 home:fbui:systemd:openSUSE-Factory

- Switch back to the hybrid hierarchy
  Unfortunately Kubernetes and runc are not yet ready for
  cgroupsv2. Let's reconsider the unified hierarchy in a couple of
  months.

OBS-URL: https://build.opensuse.org/request/show/794368
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1093
---
 systemd-mini.changes | 9 +++++++++
 systemd-mini.spec    | 2 +-
 systemd.changes      | 9 +++++++++
 systemd.spec         | 2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/systemd-mini.changes b/systemd-mini.changes
index d0e24ca1..c744640f 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Apr 15 19:06:27 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Switch back to the hybrid hierarchy
+
+  Unfortunately Kubernetes and runc are not yet ready for
+  cgroupsv2. Let's reconsider the unified hierarchy in a couple of
+  months.
+
 -------------------------------------------------------------------
 Mon Apr  6 12:42:01 UTC 2020 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 56aa5c68..df5cbc16 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -504,7 +504,7 @@ ntp_servers=({0..3}.suse.pool.ntp.org)
         -Dpamlibdir=/%{_lib}/security \
         -Drpmmacrosdir=no \
         -Dcertificate-root=%{_sysconfdir}/pki/systemd \
-        -Ddefault-hierarchy=unified \
+        -Ddefault-hierarchy=hybrid \
         -Ddefault-kill-user-processes=false \
         -Dntp-servers="${ntp_servers[*]}" \
         -Drc-local=/etc/init.d/boot.local \
diff --git a/systemd.changes b/systemd.changes
index d0e24ca1..c744640f 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Apr 15 19:06:27 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Switch back to the hybrid hierarchy
+
+  Unfortunately Kubernetes and runc are not yet ready for
+  cgroupsv2. Let's reconsider the unified hierarchy in a couple of
+  months.
+
 -------------------------------------------------------------------
 Mon Apr  6 12:42:01 UTC 2020 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index fc5cae85..293d7fef 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -502,7 +502,7 @@ ntp_servers=({0..3}.suse.pool.ntp.org)
         -Dpamlibdir=/%{_lib}/security \
         -Drpmmacrosdir=no \
         -Dcertificate-root=%{_sysconfdir}/pki/systemd \
-        -Ddefault-hierarchy=unified \
+        -Ddefault-hierarchy=hybrid \
         -Ddefault-kill-user-processes=false \
         -Dntp-servers="${ntp_servers[*]}" \
         -Drc-local=/etc/init.d/boot.local \