From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 9 Mar 2023 14:27:48 +0000 (+0100)
Subject: test: fall back to /sys/fs/cgroup/systemd if necessary
X-Git-Tag: v254-rc1~1077^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=715b4c26dc9f447a8d7b8cab33c243e15386ce2c;p=thirdparty%2Fsystemd.git

test: fall back to /sys/fs/cgroup/systemd if necessary

Necessary for some CI setups where we boot an nspawn container on a host
with older systemd with legacy hierarchy, so systemd mounts its stuff
under /sys/fs/cgroup/systemd.
---

diff --git a/test/units/testsuite-74.cgls.sh b/test/units/testsuite-74.cgls.sh
index 120570c9cc0..9268f42baa6 100755
--- a/test/units/testsuite-74.cgls.sh
+++ b/test/units/testsuite-74.cgls.sh
@@ -14,7 +14,8 @@ systemd-cgls --cgroup-id=no
 systemd-cgls /system.slice/systemd-journald.service
 systemd-cgls /system.slice/systemd-journald.service /init.scope
 systemd-cgls /sys/fs/cgroup/system.slice/systemd-journald.service /init.scope
-(cd /sys/fs/cgroup/init.scope && systemd-cgls)
+[[ -d /sys/fs/cgroup/init.scope ]] && init_scope="init.scope" || init_scope="systemd/init.scope"
+(cd "/sys/fs/cgroup/$init_scope" && systemd-cgls)
 systemd-cgls --unit=systemd-journald.service
 # There's most likely no user session running, so we need to create one
 systemd-run --user --wait --pipe -M testuser@.host systemd-cgls --user-unit=app.slice