File 1018-man-Restore-systemd.unified_cgroup_hierarchy-0-cmdli.patch of Package systemd.36650

From 606250b580a75a36031833bccff9264ba9452e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Koutn=C3=BD?= <mkoutny@suse.com>
Date: Thu, 7 Mar 2024 18:49:37 +0100
Subject: [PATCH] man: Restore systemd.unified_cgroup_hierarchy=0
 cmdline option

We allow fallback to hybrid setup during transitional period.
Thus mention the option that serves the purpose and drop history section
that applies primarily to upstream versions.
---
 man/kernel-command-line.xml | 14 +-------------
 man/systemd.xml             | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 20d85459e1..123cb762f6 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -70,6 +70,7 @@
         <term><varname>systemd.default_standard_error=</varname></term>
         <term><varname>systemd.setenv=</varname></term>
         <term><varname>systemd.machine_id=</varname></term>
+        <term><varname>systemd.unified_cgroup_hierarchy</varname></term>
         <term><varname>systemd.set_credential=</varname></term>
         <term><varname>systemd.set_credential_binary=</varname></term>
         <term><varname>systemd.import_credentials=</varname></term>
@@ -609,19 +610,6 @@
     </variablelist>
   </refsect1>
 
-  <refsect1>
-      <title>History</title>
-
-      <variablelist>
-        <varlistentry>
-          <term>systemd 252</term>
-          <listitem><para>Kernel command-line arguments <varname>systemd.unified_cgroup_hierarchy</varname>
-          and <varname>systemd.legacy_systemd_cgroup_controller</varname> were deprecated. Please switch to
-          the unified cgroup hierarchy.</para></listitem>
-        </varlistentry>
-      </variablelist>
-  </refsect1>
-
   <refsect1>
       <title>See Also</title>
       <para>
diff --git a/man/systemd.xml b/man/systemd.xml
index 218ab7e6f3..775089276e 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -933,6 +933,14 @@
         for every boot.</para></listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><varname>systemd.unified_cgroup_hierarchy</varname></term>
+
+        <listitem><para>When specified with a false argument, fall back to hybrid cgroup hierarchy. The
+        hybrid mode is deprecated.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><varname>systemd.set_credential=</varname></term>
         <term><varname>systemd.set_credential_binary=</varname></term>
@@ -1348,19 +1356,6 @@
     </variablelist>
   </refsect1>
 
-  <refsect1>
-      <title>History</title>
-
-      <variablelist>
-        <varlistentry>
-          <term>systemd 252</term>
-          <listitem><para>Kernel command-line arguments <varname>systemd.unified_cgroup_hierarchy</varname>
-          and <varname>systemd.legacy_systemd_cgroup_controller</varname> were deprecated. Please switch to
-          the unified cgroup hierarchy.</para></listitem>
-        </varlistentry>
-      </variablelist>
-  </refsect1>
-
   <refsect1>
     <title>See Also</title>
     <para>
-- 
2.35.3