From 8b3af8b2acc7339c7ae6f6bf5cbd65f9285ae128 Mon Sep 17 00:00:00 2001
From: h30032433 <huyubiao@huawei.com>
Date: Mon, 18 Mar 2024 15:05:27 +0800
Subject: [PATCH] switch systemd back to cgroup v1 to prevent the
 docker.service startup failure

(cherry picked from commit b312404196accbf4cb5b228b4efebfd688c9c2f1)
---
 systemd.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/systemd.spec b/systemd.spec
index 1cc6264..3b8e12f 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -25,7 +25,7 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 Version:        255
-Release:        5
+Release:        6
 License:        MIT and LGPLv2+ and GPLv2+
 Summary:        System and Service Manager
 
@@ -350,7 +350,7 @@ CONFIGURE_OPTS=(
         -Db_ndebug=false
         -Dman=enabled
         -Dversion-tag=v%{version}-%{release}
-        -Ddefault-hierarchy=unified
+        -Ddefault-hierarchy=legacy
         -Ddefault-dnssec=allow-downgrade
         # https://bugzilla.redhat.com/show_bug.cgi?id=1867830
         -Ddefault-mdns=yes
@@ -1635,6 +1635,9 @@ fi
 %{_libdir}/security/pam_systemd_loadkey.so
 
 %changelog
+* Mon Mar 18 2024 huyubiao <huyubiao@huawei.com> - 255-6
+- switch systemd back to cgroup v1 to prevent the docker.service startup failure
+
 * Fri Mar 1 2024 huyubiao <huyubiao@huawei.com> - 255-5
 - move the architecture patches after Patch9800 (excluding Patch9800)