shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

test: aux setup

Browse Source 
Avoid endless loop if there was no 'remove' progress.
This commit is contained in:
Zdenek Kabelac 2019-12-10 13:30:11 +01:00
parent 89d839e541
commit 8ab1d489f3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/lib/aux.sh
View File

@ -382,7 +382,7 @@ teardown_devs_prefixed() {
while :; do while :; do
local sortby="name" local sortby="name"
local num_devs=0 local progress=0
# HACK: sort also by minors - so we try to close 'possibly later' created device first # HACK: sort also by minors - so we try to close 'possibly later' created device first
test "$i" = 0 || sortby="-minor" test "$i" = 0 || sortby="-minor"
@ -392,23 +392,23 @@ teardown_devs_prefixed() {
DM_NAME=${dm##DM_NAME=} DM_NAME=${dm##DM_NAME=}
DM_NAME=${DM_NAME%%;DM_OPEN*} DM_NAME=${DM_NAME%%;DM_OPEN*}
DM_OPEN=${dm##*;DM_OPEN=} DM_OPEN=${dm##*;DM_OPEN=}
local force="-f"
if test "$i" = 0; then if test "$i" = 0; then
if test "$once" = 1 ; then if test "$once" = 1 ; then
once=0 once=0
echo "## removing stray mapped devices with names beginning with $prefix: " echo "## removing stray mapped devices with names beginning with $prefix: "
fi fi
test "$DM_OPEN" = 0 || break # stop loop with 1st. opened device test "$DM_OPEN" = 0 || break # stop loop with 1st. opened device
dmsetup remove "$DM_NAME" --mangle none || true # &>/dev/null || touch REMOVE_FAILED & force=""
else
dmsetup remove -f "$DM_NAME" --mangle none || true
fi fi
num_devs=$(( num_devs + 1 )) # Succesfull 'remove' signals progress
dmsetup remove $force "$DM_NAME" --mangle none && progress=1
done done
test "$i" = 0 || break test "$i" = 0 || break
test "$num_devs" -gt 0 || break test "$progress" = 1 || break
udev_wait udev_wait
wait wait