From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2438E15802E for ; Mon, 1 Jul 2024 19:32:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60F572BC01B; Mon, 1 Jul 2024 19:32:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43BFF2BC01B for ; Mon, 1 Jul 2024 19:32:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F004343023 for ; Mon, 1 Jul 2024 19:32:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2E3D1B91 for ; Mon, 1 Jul 2024 19:32:11 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1719862260.dedee352804b32f4e0e354e06d83b6963e69af85.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/systemd-256.1-r2.ebuild sys-apps/systemd/systemd-256.1-r3.ebuild sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: dedee352804b32f4e0e354e06d83b6963e69af85 X-VCS-Branch: master Date: Mon, 1 Jul 2024 19:32:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bc5a95b5-a0fc-4dff-8f12-728effac9d32 X-Archives-Hash: 8f7d528750f27227bbfa88133a435bb6 commit: dedee352804b32f4e0e354e06d83b6963e69af85 Author: Mike Gilbert gentoo org> AuthorDate: Mon Jul 1 19:30:36 2024 +0000 Commit: Mike Gilbert gentoo 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 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