shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-20 14:03:39 +03:00
Code

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

Browse Source 
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.

(cherry picked from commit 715b4c26dc9f447a8d7b8cab33c243e15386ce2c)
(cherry picked from commit ff746117083e7418e378e46868aad601db57d920)
(cherry picked from commit 35f3b83cd60fb5eb56a1da753b45431ce0cbe865)
This commit is contained in:
Frantisek Sumsal 2023-03-09 15:27:48 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent b22bd6de9e
commit 234308b264
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/units/testsuite-74.cgls.sh
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