commit: dedee352804b32f4e0e354e06d83b6963e69af85
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 1 19:30:36 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 1 19:31:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dedee352
sys-apps/systemd: update pkg_pretend check
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/systemd/{systemd-256.1-r2.ebuild => systemd-256.1-r3.ebuild} | 4 ++--
sys-apps/systemd/systemd-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-apps/systemd/systemd-256.1-r2.ebuild
b/sys-apps/systemd/systemd-256.1-r3.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-256.1-r2.ebuild
rename to sys-apps/systemd/systemd-256.1-r3.ebuild
index 178565ec7d40..78f1f78f01df 100644
--- a/sys-apps/systemd/systemd-256.1-r2.ebuild
+++ b/sys-apps/systemd/systemd-256.1-r3.ebuild
@@ -190,8 +190,8 @@ check_cgroup_layout() {
eerror "This system appears to be booted with the 'hybrid' cgroup
layout."
eerror "This layout obsolete and is disabled in systemd."
- if grep -qF 'systemd.legacy_systemd_cgroup_controller' /proc/cmdline;
then
- eerror "Remove the systemd.legacy_systemd_cgroup_controller
option"
+ if grep -qF 'systemd.unified_cgroup_hierarchy'; then
+ eerror "Remove the systemd.unified_cgroup_hierarchy option"
eerror "from the kernel command line and reboot."
die "hybrid cgroup layout detected"
fi
diff --git a/sys-apps/systemd/systemd-9999.ebuild
b/sys-apps/systemd/systemd-9999.ebuild
index 178565ec7d40..78f1f78f01df 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -190,8 +190,8 @@ check_cgroup_layout() {
eerror "This system appears to be booted with the 'hybrid' cgroup
layout."
eerror "This layout obsolete and is disabled in systemd."
- if grep -qF 'systemd.legacy_systemd_cgroup_controller' /proc/cmdline;
then
- eerror "Remove the systemd.legacy_systemd_cgroup_controller
option"
+ if grep -qF 'systemd.unified_cgroup_hierarchy'; then
+ eerror "Remove the systemd.unified_cgroup_hierarchy option"
eerror "from the kernel command line and reboot."
die "hybrid cgroup layout detected"
fi
