[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     e473f70fbcfc239779f91c1649af4f369e0f2b6e
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 17 14:18:23 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Mar 17 14:18:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e473f70f

sys-apps/systemd: fix cgroup-related test failures

Closes: https://bugs.gentoo.org/771819
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd/files/247-cgroup-test.patch | 35 ++++++++++++++++++++++++++++
 sys-apps/systemd/systemd-247.2-r4.ebuild     |  1 +
 2 files changed, 36 insertions(+)

diff --git a/sys-apps/systemd/files/247-cgroup-test.patch b/sys-apps/systemd/files/247-cgroup-test.patch
new file mode 100644
index 00000000000..bfa4422a621
--- /dev/null
+++ b/sys-apps/systemd/files/247-cgroup-test.patch
@@ -0,0 +1,35 @@
+From ddfc6ad061ad47caeeff901d27cbc59af85e0db3 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Tue, 9 Mar 2021 17:57:37 -0500
+Subject: [PATCH] cg_unified_cached: return ENOMEDIUM if we cannot find a known
+ hierarchy
+
+When the test suite is being run in a foreign environment,
+/sys/fs/cgroup might not be set up in a way that we recognize.
+Returning ENOMEDIUM causes the tests to be skipped in this case.
+
+Bug: https://bugs.gentoo.org/771819
+---
+ src/basic/cgroup-util.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
+index 527043a2b39..0b252eb28fb 100644
+--- a/src/basic/cgroup-util.c
++++ b/src/basic/cgroup-util.c
+@@ -2052,8 +2052,14 @@ int cg_unified_cached(bool flush) {
+                         unified_cache = CGROUP_UNIFIED_SYSTEMD;
+                         unified_systemd_v232 = false;
+                 } else {
+-                        if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0)
++                        if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0) {
++                                if (errno == ENOENT) {
++                                        /* Some other software may have set up /sys/fs/cgroup in a configuration we do not recognize. */
++                                        log_debug_errno(errno, "Unsupported cgroupsv1 setup detected: name=systemd hierarchy not found.");
++                                        return -ENOMEDIUM;
++                                }
+                                 return log_debug_errno(errno, "statfs(\"/sys/fs/cgroup/systemd\" failed: %m");
++                        }
+ 
+                         if (F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) {
+                                 log_debug("Found cgroup2 on /sys/fs/cgroup/systemd, unified hierarchy for systemd controller (v232 variant)");

diff --git a/sys-apps/systemd/systemd-247.2-r4.ebuild b/sys-apps/systemd/systemd-247.2-r4.ebuild
index 4c9425020e3..4853d82c9c9 100644
--- a/sys-apps/systemd/systemd-247.2-r4.ebuild
+++ b/sys-apps/systemd/systemd-247.2-r4.ebuild
@@ -212,6 +212,7 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
+		"${FILESDIR}"/247-cgroup-test.patch
 	)
 
 	if ! use vanilla; then