[Devel] [PATCH RHEL9 COMMIT] Revert "configs/cgroup: Make cgroup v1 the default hierarcy"

Konstantin Khorenko khorenko at virtuozzo.com
Mon Jul 15 19:00:28 MSK 2024


The commit is pushed to "branch-rh9-5.14.0-427.22.1.vz9.62.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-427.22.1.vz9.62.5
------>
commit 7f6fb772522d845ddc3ba1e9989d67ef2af49c04
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date:   Mon Jul 15 18:45:00 2024 +0300

    Revert "configs/cgroup: Make cgroup v1 the default hierarcy"
    
    This reverts commit 9ea0a786258ac2631a0f87193a4a001401a7e99e.
    
    Now we are ready to go with cgroup v2 on all levels, so it’s time to
    drop our hack which kept us with cgroup v1 by default.
    
    https://virtuozzo.atlassian.net/browse/PSBM-157370
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
    
    Feature: cgroup: unified cgroup hierarchy (cgroup v2) support
---
 redhat/configs/custom-overrides/generic/CONFIG_CMDLINE          | 1 -
 redhat/configs/custom-overrides/generic/CONFIG_CMDLINE_BOOL     | 1 -
 redhat/configs/custom-overrides/generic/CONFIG_CMDLINE_OVERRIDE | 1 -
 3 files changed, 3 deletions(-)

diff --git a/redhat/configs/custom-overrides/generic/CONFIG_CMDLINE b/redhat/configs/custom-overrides/generic/CONFIG_CMDLINE
deleted file mode 100644
index 1380a978c416..000000000000
--- a/redhat/configs/custom-overrides/generic/CONFIG_CMDLINE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CMDLINE="systemd.unified_cgroup_hierarchy=0"
diff --git a/redhat/configs/custom-overrides/generic/CONFIG_CMDLINE_BOOL b/redhat/configs/custom-overrides/generic/CONFIG_CMDLINE_BOOL
deleted file mode 100644
index a04ac67dfe3b..000000000000
--- a/redhat/configs/custom-overrides/generic/CONFIG_CMDLINE_BOOL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CMDLINE_BOOL=y
diff --git a/redhat/configs/custom-overrides/generic/CONFIG_CMDLINE_OVERRIDE b/redhat/configs/custom-overrides/generic/CONFIG_CMDLINE_OVERRIDE
deleted file mode 100644
index 75d188dd7f28..000000000000
--- a/redhat/configs/custom-overrides/generic/CONFIG_CMDLINE_OVERRIDE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CMDLINE_OVERRIDE is not set


More information about the Devel mailing list