Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol

scripts/common.sh

@@ -18,6 +18,8 @@ DUMP_LOG=
 ERROR=
 MODULES=()
 
+LOSETUP=/sbin/losetup
+
 die() {
 	echo -e "${PROG}: $1" >&2
 	exit 1
@@ -146,9 +148,9 @@ unload_modules() {
 
 unused_loop_device() {
 	for DEVICE in `ls -1 /dev/loop*`; do
-		losetup $DEVICE &>/dev/null
+		${LOSETUP} ${DEVICE} &>/dev/null
 		if [ $? -ne 0 ]; then
-			echo $DEVICE
+			echo ${DEVICE}
 			return
 		fi
 	done

scripts/zpool-config/lo-raid0.sh

@@ -16,7 +16,7 @@ zpool_create() {
 		rm -f ${FILE} || exit 1
 		dd if=/dev/zero of=${FILE} bs=1024k count=256 &>/dev/null ||
 			die "Error $? creating ${FILE}"
-		losetup ${DEVICE} ${FILE} ||
+		${LOSETUP} ${DEVICE} ${FILE} ||
 			die "Error $? creating ${FILE} -> ${DEVICE} loopback"
 		DEVICES="${DEVICES} ${DEVICE}"
 	done
@@ -30,9 +30,9 @@ zpool_destroy() {
 	${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}
 
 	for FILE in ${FILES}; do
-		DEVICE=`/sbin/losetup -a | grep ${FILE} | head -n1|cut -f1 -d:`
+		DEVICE=`${LOSETUP} -a | grep ${FILE} | head -n1|cut -f1 -d:`
 		msg "Removing ${FILE} using loopback device ${DEVICE}"
-		losetup -d ${DEVICE} ||
+		${LOSETUP} -d ${DEVICE} ||
 			die "Error $? destroying ${FILE} -> ${DEVICE} loopback"
 		rm -f ${FILE} || exit 1
 	done

scripts/zpool-config/lo-raid10.sh

@@ -18,7 +18,7 @@ zpool_create() {
 		rm -f ${FILE} || exit 1
 		dd if=/dev/zero of=${FILE} bs=1024k count=256 &>/dev/null ||
 			die "Error $? creating ${FILE}"
-		losetup ${DEVICE} ${FILE} ||
+		${LOSETUP} ${DEVICE} ${FILE} ||
 			die "Error $? creating ${FILE} -> ${DEVICE} loopback"
 		DEVICES_M1="${DEVICES_M1} ${DEVICE}"
 	done
@@ -29,7 +29,7 @@ zpool_create() {
 		rm -f ${FILE} || exit 1
 		dd if=/dev/zero of=${FILE} bs=1024k count=256 &>/dev/null ||
 			die "Error $? creating ${FILE}"
-		losetup ${DEVICE} ${FILE} ||
+		${LOSETUP} ${DEVICE} ${FILE} ||
 			die "Error $? creating ${FILE} -> ${DEVICE} loopback"
 		DEVICES_M2="${DEVICES_M2} ${DEVICE}"
 	done
@@ -45,9 +45,9 @@ zpool_destroy() {
 	${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}
 
 	for FILE in ${FILES}; do
-		DEVICE=`/sbin/losetup -a | grep ${FILE} | head -n1|cut -f1 -d:`
+		DEVICE=`${LOSETUP} -a | grep ${FILE} | head -n1|cut -f1 -d:`
 		msg "Removing ${FILE} using loopback device ${DEVICE}"
-		losetup -d ${DEVICE} ||
+		${LOSETUP} -d ${DEVICE} ||
 			die "Error $? destroying ${FILE} -> ${DEVICE} loopback"
 		rm -f ${FILE} || exit 1
 	done

scripts/zpool-config/lo-raidz.sh

@@ -16,7 +16,7 @@ zpool_create() {
 		rm -f ${FILE} || exit 1
 		dd if=/dev/zero of=${FILE} bs=1024k count=256 &>/dev/null ||
 			die "Error $? creating ${FILE}"
-		losetup ${DEVICE} ${FILE} ||
+		${LOSETUP} ${DEVICE} ${FILE} ||
 			die "Error $? creating ${FILE} -> ${DEVICE} loopback"
 		DEVICES="${DEVICES} ${DEVICE}"
 	done
@@ -30,9 +30,9 @@ zpool_destroy() {
 	${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}
 
 	for FILE in ${FILES}; do
-		DEVICE=`/sbin/losetup -a | grep ${FILE} | head -n1|cut -f1 -d:`
+		DEVICE=`${LOSETUP} -a | grep ${FILE} | head -n1|cut -f1 -d:`
 		msg "Removing ${FILE} using loopback device ${DEVICE}"
-		losetup -d ${DEVICE} ||
+		${LOSETUP} -d ${DEVICE} ||
 			die "Error $? destroying ${FILE} -> ${DEVICE} loopback"
 		rm -f ${FILE} || exit 1
 	done

scripts/zpool-config/lo-raidz2.sh

@@ -16,7 +16,7 @@ zpool_create() {
 		rm -f ${FILE} || exit 1
 		dd if=/dev/zero of=${FILE} bs=1024k count=256 &>/dev/null ||
 			die "Error $? creating ${FILE}"
-		losetup ${DEVICE} ${FILE} ||
+		${LOSETUP} ${DEVICE} ${FILE} ||
 			die "Error $? creating ${FILE} -> ${DEVICE} loopback"
 		DEVICES="${DEVICES} ${DEVICE}"
 	done
@@ -30,9 +30,9 @@ zpool_destroy() {
 	${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}
 
 	for FILE in ${FILES}; do
-		DEVICE=`/sbin/losetup -a | grep ${FILE} | head -n1|cut -f1 -d:`
+		DEVICE=`${LOSETUP} -a | grep ${FILE} | head -n1|cut -f1 -d:`
 		msg "Removing ${FILE} using loopback device ${DEVICE}"
-		losetup -d ${DEVICE} ||
+		${LOSETUP} -d ${DEVICE} ||
 			die "Error $? destroying ${FILE} -> ${DEVICE} loopback"
 		rm -f ${FILE} || exit 1
 	done