Do not return /dev/loop-control in unused_loop_device

[zfs.git] / scripts / zpool-config / lo-raidz.sh

diff --git a/scripts/zpool-config/lo-raidz.sh b/scripts/zpool-config/lo-raidz.sh
index 509f6ee..db5de7c 100644 (file)
--- a/scripts/zpool-config/lo-raidz.sh
+++ b/scripts/zpool-config/lo-raidz.sh
@@ -10,6 +10,8 @@ FILES="/tmp/zpool-vdev0  \
 DEVICES=""
 
 zpool_create() {
+       check_loop_utils
+
        for FILE in ${FILES}; do
                DEVICE=`unused_loop_device`
                msg "Creating ${FILE} using loopback device ${DEVICE}"
@@ -29,6 +31,9 @@ zpool_destroy() {
        msg ${ZPOOL} destroy ${ZPOOL_NAME}
        ${ZPOOL} destroy ${ZPOOL_NAME}
 
+       # Delay to ensure device is closed before removing loop device
+       sleep 1
+
        for FILE in ${FILES}; do
                DEVICE=`${LOSETUP} -a | grep ${FILE} | head -n1|cut -f1 -d:`
                msg "Removing ${FILE} using loopback device ${DEVICE}"