diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-05-08 11:41:04 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-05-08 12:27:24 +0200 |
| commit | 65690de6f994b383e2f060df855e151a45356264 (patch) | |
| tree | 32ee069f415c0a37d4d0382ffca52263200084fc | |
| parent | tmpfiles: Don't fail if file does not exist in item_do() (diff) | |
| download | systemd-65690de6f994b383e2f060df855e151a45356264.tar.xz systemd-65690de6f994b383e2f060df855e151a45356264.zip | |
TEST-81-GENERATORS: Do a lazy unmounts
Otherwise we might fail if PID 1 is currently accessing these files.
Fixes #32692 (hopefully)
| -rwxr-xr-x | test/units/generator-utils.sh | 2 | ||||
| -rwxr-xr-x | test/units/testsuite-81.getty-generator.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/units/generator-utils.sh b/test/units/generator-utils.sh index fb62747fa1..97a63d8043 100755 --- a/test/units/generator-utils.sh +++ b/test/units/generator-utils.sh @@ -72,7 +72,7 @@ run_and_list() { ls -lR "$out_dir" if [[ -n "${environ:-}" ]]; then - umount /proc/1/environ + umount /proc/1/environ --lazy rm -f "$environ" fi } diff --git a/test/units/testsuite-81.getty-generator.sh b/test/units/testsuite-81.getty-generator.sh index 103e966191..d1dd22c18e 100755 --- a/test/units/testsuite-81.getty-generator.sh +++ b/test/units/testsuite-81.getty-generator.sh @@ -85,5 +85,5 @@ PID1_ENVIRON="SYSTEMD_GETTY_AUTO=0" run_and_list "$GENERATOR_BIN" "$OUT_DIR" [[ "$(find "$OUT_DIR" ! -type d | wc -l)" -eq 0 ]] # Cleanup -umount /sys/class/tty/console/active +umount /sys/class/tty/console/active --lazy rm -f "${DUMMY_CONSOLES[@]/#//dev/}" /dev/notatty99 |