From 39fe5b1cf9406a83e2eb2f892363edc32d40494b Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 20 Jan 2009 21:34:29 -0800 Subject: [PATCH] Minor script fixes --- scripts/zpool-config/file-raidz.sh | 4 ++-- scripts/zpool-config/file-raidz2.sh | 4 ++-- scripts/zpool-config/lo-raid0.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/zpool-config/file-raidz.sh b/scripts/zpool-config/file-raidz.sh index 6867489079..e7e4a46358 100644 --- a/scripts/zpool-config/file-raidz.sh +++ b/scripts/zpool-config/file-raidz.sh @@ -16,8 +16,8 @@ zpool_create() { die "Error $? creating ${FILE}" done - msg ${CMDDIR}/zpool/zpool create raidz ${ZPOOL_NAME} ${FILES} - ${CMDDIR}/zpool/zpool create raidz ${ZPOOL_NAME} ${FILES} || exit 1 + msg ${CMDDIR}/zpool/zpool create ${ZPOOL_NAME} raidz ${FILES} + ${CMDDIR}/zpool/zpool create ${ZPOOL_NAME} raidz ${FILES} || exit 1 } zpool_destroy() { diff --git a/scripts/zpool-config/file-raidz2.sh b/scripts/zpool-config/file-raidz2.sh index 09b20e4c9c..1dd97d3eea 100644 --- a/scripts/zpool-config/file-raidz2.sh +++ b/scripts/zpool-config/file-raidz2.sh @@ -16,8 +16,8 @@ zpool_create() { die "Error $? creating ${FILE}" done - msg ${CMDDIR}/zpool/zpool create raidz2 ${ZPOOL_NAME} ${FILES} - ${CMDDIR}/zpool/zpool create raidz2 ${ZPOOL_NAME} ${FILES} || exit 1 + msg ${CMDDIR}/zpool/zpool create ${ZPOOL_NAME} raidz2 ${FILES} + ${CMDDIR}/zpool/zpool create ${ZPOOL_NAME} raidz2 ${FILES} || exit 1 } zpool_destroy() { diff --git a/scripts/zpool-config/lo-raid0.sh b/scripts/zpool-config/lo-raid0.sh index cecdf86502..84c355266c 100644 --- a/scripts/zpool-config/lo-raid0.sh +++ b/scripts/zpool-config/lo-raid0.sh @@ -14,7 +14,7 @@ zpool_create() { DEVICE=`/sbin/losetup -f` msg "Creating ${FILE} using loopback device ${DEVICE}" rm -f ${FILE} || exit 1 - dd if=/dev/zero of=${FILE} bs=1024k count=256 status=noxfer &>/dev/null || + dd if=/dev/zero of=${FILE} bs=1024k count=256 &>/dev/null || die "Error $? creating ${FILE}" losetup ${DEVICE} ${FILE} || die "Error $? creating ${FILE} -> ${DEVICE} loopback" @@ -30,7 +30,7 @@ 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=`/sbin/losetup -a | grep ${FILE} | head -n1|cut -f1 -d:` msg "Removing ${FILE} using loopback device ${DEVICE}" losetup -d ${DEVICE} || die "Error $? destroying ${FILE} -> ${DEVICE} loopback"