diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2022-12-13 15:12:31 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2022-12-13 15:12:31 +0100 |
| commit | 9df54deead6845fc38509c412736b47a9a5d5187 (patch) | |
| tree | e2f818318ab9061e7fcaba0a24003f0340ef5197 /testsuite/mount.tests | |
| parent | a1856934ba795f81546f5dd9a14ba4faa757ce52 (diff) | |
| download | busybox-w32-9df54deead6845fc38509c412736b47a9a5d5187.tar.gz busybox-w32-9df54deead6845fc38509c412736b47a9a5d5187.tar.bz2 busybox-w32-9df54deead6845fc38509c412736b47a9a5d5187.zip | |
testsuite/mount.tests: accomodate umount failure seen on 5.18.0
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to '')
| -rwxr-xr-x | testsuite/mount.tests | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/testsuite/mount.tests b/testsuite/mount.tests index b6d5ebe08..7370805cd 100755 --- a/testsuite/mount.tests +++ b/testsuite/mount.tests | |||
| @@ -104,12 +104,24 @@ mount -r -o loop -t ext2 z1/e2img z2 || { echo 'mount -r -o loop error'; e | |||
| 104 | mount -o remount,ro z1 || { echo 'mount -o remount,ro error'; exit 1; } | 104 | mount -o remount,ro z1 || { echo 'mount -o remount,ro error'; exit 1; } |
| 105 | ) | 105 | ) |
| 106 | umount -d mount.dir/z2 | 106 | umount -d mount.dir/z2 |
| 107 | ##losetup -d /dev/loop* | 107 | ##sleep 0.1 |
| 108 | umount -d mount.dir/z1 | 108 | umount -d mount.dir/z1 |
| 109 | rm -rf mount.dir | 109 | rm -rf mount.dir |
| 110 | echo DONE | 110 | echo DONE |
| 111 | " \ | 111 | " \ |
| 112 | "DONE\n" "" "" | 112 | "DONE\n" "" "" |
| 113 | 113 | ||
| 114 | # On 5.18.0, "umount -d mount.dir/z1" above fails. | ||
| 115 | # (It would work with "sleep 0.1" - looks like z1/e2img | ||
| 116 | # is momentarily keeping z1 mountpoint busy, even though | ||
| 117 | # the "umount" which freed z1/e2img from being the base | ||
| 118 | # of z2 mountpoint has returned). | ||
| 119 | # Fixing the mess if it did fail: | ||
| 120 | if test -d mount.dir/z1; then | ||
| 121 | ls -ld mount.dir/z1/* mount.dir/z1 | ||
| 122 | sleep 1 | ||
| 123 | umount -d mount.dir/z1 | ||
| 124 | rmdir mount.dir/z1 mount.dir | ||
| 125 | fi | ||
| 114 | 126 | ||
| 115 | exit $FAILCOUNT | 127 | exit $FAILCOUNT |