diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2024-02-13 13:48:26 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-04-30 22:10:02 +0200 |
| commit | 3630f5aaf8d6235dc1aae8a32712158a4c8ddfc7 (patch) | |
| tree | 7e74b5b86f4fdf632509203f855404de75253a75 /test/test-functions | |
| parent | TEST-13-NSPAWN: move container template to /usr/share (diff) | |
| download | systemd-3630f5aaf8d6235dc1aae8a32712158a4c8ddfc7.tar.xz systemd-3630f5aaf8d6235dc1aae8a32712158a4c8ddfc7.zip | |
TEST-13-NSPAWN: move disk images to /var/tmp
/tmp may not be large enough to contain disk images
and will result in strange errors when it runs out of space.
Diffstat (limited to 'test/test-functions')
| -rw-r--r-- | test/test-functions | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/test-functions b/test/test-functions index 59242b3569..10ea6ef03a 100644 --- a/test/test-functions +++ b/test/test-functions @@ -476,8 +476,7 @@ run_qemu() { local CONSOLE=ttyS0 - # Reset the boot counter, if present - rm -f "${initdir:?}/var/tmp/.systemd_reboot_count" + find "${initdir:?}/var/tmp" -mindepth 1 -delete rm -f "$initdir"/{testok,failed,skipped} # make sure the initdir is not mounted to avoid concurrent access cleanup_initdir @@ -651,8 +650,7 @@ run_qemu() { # success), or 1 if nspawn is not available. run_nspawn() { [[ -d /run/systemd/system ]] || return 1 - # Reset the boot counter, if present - rm -f "${initdir:?}/var/tmp/.systemd_reboot_count" + find "${initdir:?}/var/tmp" -mindepth 1 -delete rm -f "${initdir:?}"/{testok,failed,skipped} local nspawn_cmd=() |