Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
This commit is contained in:
commit
c43174e8fb
|
@ -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() {
|
||||||
|
|
|
@ -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() {
|
||||||
|
|
|
@ -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"
|
||||||
|
|
Loading…
Reference in New Issue