From 08774dc558e93c4cabda1968aaa34bbf35b95504 Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Fri, 5 Dec 2008 05:03:23 +0000 Subject: [PATCH] Fix test-utils.h for rhel4 backward compatability. for losetup, break out of the loop when successful setup of loop device, and only look at 7 loop devices (default loop module setting) for blockdev, use old option if new one is not available --- test/test-utils.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/test-utils.sh b/test/test-utils.sh index 003cf2ea3..831b742d9 100644 --- a/test/test-utils.sh +++ b/test/test-utils.sh @@ -73,15 +73,19 @@ prepare_loop() { return 0 else # no -f support - # Iterate through $G_dev_/loop{,/}{0,1,2,3,4,5,6,7,8,9} + # Iterate through $G_dev_/loop{,/}{0,1,2,3,4,5,6,7} for slash in '' /; do - for i in 0 1 2 3 4 5 6 7 8 9; do + for i in 0 1 2 3 4 5 6 7; do local dev=$G_dev_/loop$slash$i ! losetup $dev >/dev/null 2>&1 || continue # got a free losetup "$dev" "$LOOPFILE" LOOP=$dev + break done + if [ -n "$LOOP" ]; then + break + fi done test -n "$LOOP" # confirm or fail return 0 @@ -99,7 +103,10 @@ prepare_devs() { PREFIX="LVMTEST$$" - local loopsz=`blockdev --getsz $LOOP` + if ! loopsz=`blockdev --getsz $LOOP 2>/dev/null`; then + loopsz=`blockdev --getsize $LOOP 2>/dev/null` + fi + local size=$(($loopsz/$n)) for i in `seq 1 $n`; do -- 2.43.5