Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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

This commit is contained in:
Brian Behlendorf 2009-01-20 21:37:00 -08:00
parent 223bfde15d 39fe5b1cf9
commit 69fae65fda
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/zpool-config/file-raidz.sh
View File

@ -16,8 +16,8 @@ zpool_create() {
die "Error $? creating ${FILE}" die "Error $? creating ${FILE}"
done done
msg ${CMDDIR}/zpool/zpool create raidz ${ZPOOL_NAME} ${FILES} msg ${CMDDIR}/zpool/zpool create ${ZPOOL_NAME} raidz ${FILES}
${CMDDIR}/zpool/zpool create raidz ${ZPOOL_NAME} ${FILES} || exit 1 ${CMDDIR}/zpool/zpool create ${ZPOOL_NAME} raidz ${FILES} || exit 1
} }
zpool_destroy() { zpool_destroy() {

4
scripts/zpool-config/file-raidz2.sh
View File

@ -16,8 +16,8 @@ zpool_create() {
die "Error $? creating ${FILE}" die "Error $? creating ${FILE}"
done done
msg ${CMDDIR}/zpool/zpool create raidz2 ${ZPOOL_NAME} ${FILES} msg ${CMDDIR}/zpool/zpool create ${ZPOOL_NAME} raidz2 ${FILES}
${CMDDIR}/zpool/zpool create raidz2 ${ZPOOL_NAME} ${FILES} || exit 1 ${CMDDIR}/zpool/zpool create ${ZPOOL_NAME} raidz2 ${FILES} || exit 1
} }
zpool_destroy() { zpool_destroy() {

4
scripts/zpool-config/lo-raid0.sh
View File

@ -14,7 +14,7 @@ zpool_create() {
DEVICE=`/sbin/losetup -f` DEVICE=`/sbin/losetup -f`
msg "Creating ${FILE} using loopback device ${DEVICE}" msg "Creating ${FILE} using loopback device ${DEVICE}"
rm -f ${FILE} || exit 1 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}" die "Error $? creating ${FILE}"
losetup ${DEVICE} ${FILE} || losetup ${DEVICE} ${FILE} ||
die "Error $? creating ${FILE} -> ${DEVICE} loopback" die "Error $? creating ${FILE} -> ${DEVICE} loopback"
@ -30,7 +30,7 @@ zpool_destroy() {
${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME} ${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}
for FILE in ${FILES}; do 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}" msg "Removing ${FILE} using loopback device ${DEVICE}"
losetup -d ${DEVICE} || losetup -d ${DEVICE} ||
die "Error $? destroying ${FILE} -> ${DEVICE} loopback" die "Error $? destroying ${FILE} -> ${DEVICE} loopback"