diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-12-20 15:36:38 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-12-20 15:56:16 +0100 |
| commit | 5183976cea57565ccfef020761fd84f7317856a5 (patch) | |
| tree | b97e0cd4b1541e154f3619441a959ba95c1fc249 /test | |
| parent | Merge pull request #30537 from poettering/run-arg-service-type-fix (diff) | |
| download | systemd-5183976cea57565ccfef020761fd84f7317856a5.tar.xz systemd-5183976cea57565ccfef020761fd84f7317856a5.zip | |
TEST-65-ANALYZE: only mount /usr if necessary
Follow-up for 8f764b32eabd3d39abfc0f4eaffd282223df4768.
Otherwise, we fail to umount several directories on shutdown.
---
[ 15.684430] systemd[1]: Failed unmounting tmp-root-proc.mount.
[ 15.689379] systemd[1]: Failed unmounting tmp-root-run.mount.
[ 15.710572] systemd[1]: Failed unmounting tmp-root-sys-fs-cgroup.mount.
[ 15.913953] systemd[1]: Failed unmounting tmp-root-dev.mount.
[ 15.924603] systemd[1]: Failed unmounting tmp-root-sys.mount.
[ 15.938207] systemd[1]: Failed unmounting tmp-root.mount.
[ 15.952395] systemd[1]: Failed unmounting tmp.mount.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/units/testsuite-65.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/units/testsuite-65.sh b/test/units/testsuite-65.sh index 6415734651..4c92683ce0 100755 --- a/test/units/testsuite-65.sh +++ b/test/units/testsuite-65.sh @@ -179,7 +179,10 @@ systemd-analyze security --json=short | jq if [[ ! -v ASAN_OPTIONS ]]; then # check that systemd-analyze cat-config paths work in a chroot mkdir -p /tmp/root - mount --rbind / /tmp/root + mount --bind / /tmp/root + if mountpoint -q /usr; then + mount --bind /usr /tmp/root/usr + fi systemd-analyze cat-config systemd/system-preset >/tmp/out1 chroot /tmp/root systemd-analyze cat-config systemd/system-preset >/tmp/out2 diff /tmp/out{1,2} |