diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2016-06-01 17:25:06 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2016-06-01 17:37:52 +0200 |
| commit | d73a83e8cf508b6d97ee937a01ebd24a678dfabc (patch) | |
| tree | 0b8d5c26f505af635034a572d3b3807b4a9eccbc | |
| parent | d37a26b680f6c7ca9ec0bb1ce0cca189d19b525f (diff) | |
| download | lvm2-d73a83e8cf508b6d97ee937a01ebd24a678dfabc.tar.gz | |
tests: extend prepare_loop
Treat args after size as 'extra' params for losetup.
| -rw-r--r-- | test/lib/aux.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 3bb469b87..d51a65c58 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -553,6 +553,7 @@ teardown() { prepare_loop() { local size=${1=32} + local losetup_params=${@:2} local i local slash @@ -577,9 +578,9 @@ prepare_loop() { local LOOPFILE="$PWD/test.img" rm -f "$LOOPFILE" dd if=/dev/zero of="$LOOPFILE" bs=$((1024*1024)) count=0 seek=$(($size + 1)) 2> /dev/null - if LOOP=$(losetup -s -f "$LOOPFILE" 2>/dev/null); then + if LOOP=$(losetup ${losetup_params} -s -f "$LOOPFILE" 2>/dev/null); then : - elif LOOP=$(losetup -f) && losetup "$LOOP" "$LOOPFILE"; then + elif LOOP=$(losetup -f) && losetup ${losetup_params} "$LOOP" "$LOOPFILE"; then # no -s support : else @@ -590,7 +591,7 @@ prepare_loop() { local dev="$DM_DEV_DIR/loop$slash$i" ! losetup "$dev" >/dev/null 2>&1 || continue # got a free - losetup "$dev" "$LOOPFILE" + losetup ${losetup_params} "$dev" "$LOOPFILE" LOOP=$dev break done |