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.
This commit is contained in:
Frantisek Sumsal
2023-03-09 15:27:48 +01:00
parent b3ba7d6274
commit 715b4c26dc

View File

@@ -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