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

Minor script cleanup

This commit is contained in:
Brian Behlendorf 2009-01-20 15:34:38 -08:00
parent 5ae334d138
commit af43246767
5 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,11 +6,11 @@
DEVICES="/dev/hda" DEVICES="/dev/hda"
zpool_create() { zpool_create() {
msg "${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES}" msg ${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES}
${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES} || exit 1 ${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES} || exit 1
} }
zpool_destroy() { zpool_destroy() {
msg "${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}" msg ${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}
${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME} || exit 1 ${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME} || exit 1
} }

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

@ -8,28 +8,31 @@ DEVICES="/tmp/zpool-vdev0 \
/tmp/zpool-vdev2 \ /tmp/zpool-vdev2 \
/tmp/zpool-vdev3 \ /tmp/zpool-vdev3 \
/tmp/zpool-vdev4" /tmp/zpool-vdev4"
DEVICE_SIZE=512
zpool_create() { zpool_create() {
for DEV in ${DEVICES}; do for DEV in ${DEVICES}; do
LO=`/sbin/losetup -f` LO=`/sbin/losetup -f`
msg "Creating ${DEV} using loopback device ${LO}" msg "Creating ${DEV} using loopback device ${LO}"
rm -f ${DEV} || exit 1 rm -f ${DEV} || exit 1
dd if=/dev/zero of=${DEV} bs=1024k count=${DEVICE_SIZE} &>/dev/null || exit 1 dd if=/dev/zero of=${DEV} bs=1024k count=256 status=noxfer &>/dev/null ||
losetup ${LO} ${DEV} || exit 1 die "Error $? creating ${DEV}"
losetup ${LO} ${DEV} ||
die "Error $? creating ${DEV} -> ${LO} loopback"
done done
msg "${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES}" msg ${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES}
${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES} || exit 1 ${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES} || exit 1
} }
zpool_destroy() { zpool_destroy() {
msg "${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}" msg ${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}
${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME} ${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}
for DEV in ${DEVICES}; do for DEV in ${DEVICES}; do
LO=`/sbin/losetup -a | grep ${DEV} | head -n1 | cut -f1 -d:` LO=`/sbin/losetup -a | grep ${DEV} | head -n1 | cut -f1 -d:`
msg "Removing ${DEV} using loopback device ${LO}" msg "Removing ${DEV} using loopback device ${LO}"
losetup -d ${LO} ||
die "Error $? destroying ${DEV} -> ${LO} loopback"
rm -f ${DEV} || exit 1 rm -f ${DEV} || exit 1
done done
} }

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

@ -6,11 +6,11 @@
DEVICES="/dev/sda" DEVICES="/dev/sda"
zpool_create() { zpool_create() {
msg "${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES}" msg ${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES}
${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES} || exit 1 ${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES} || exit 1
} }
zpool_destroy() { zpool_destroy() {
msg "${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}" msg ${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}
${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME} || exit 1 ${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME} || exit 1
} }

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

@ -13,11 +13,11 @@ DEVICES="/dev/sda /dev/sdb /dev/sdc /dev/sdd /dev/sde /dev/sdf \
/dev/sdaq /dev/sdar /dev/sdas /dev/sdat /dev/sdau /dev/sdav" /dev/sdaq /dev/sdar /dev/sdas /dev/sdat /dev/sdau /dev/sdav"
zpool_create() { zpool_create() {
msg "${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES}" msg ${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES}
${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES} || exit 1 ${CMDDIR}/zpool/zpool create -f ${ZPOOL_NAME} ${DEVICES} || exit 1
} }
zpool_destroy() { zpool_destroy() {
msg "${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}" msg ${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}
${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME} ${CMDDIR}/zpool/zpool destroy ${ZPOOL_NAME}
} }

2
scripts/zpool-create.sh
View File

@ -78,7 +78,6 @@ if [ ${ZPOOL_DESTROY} ]; then
zpool_destroy zpool_destroy
else else
zpool_create zpool_create
fi
if [ ${VERBOSE} ]; then if [ ${VERBOSE} ]; then
echo echo
@ -89,5 +88,6 @@ if [ ${VERBOSE} ]; then
echo "zpool status ${ZPOOL_NAME}" echo "zpool status ${ZPOOL_NAME}"
${CMDDIR}/zpool/zpool status ${ZPOOL_NAME} || exit 1 ${CMDDIR}/zpool/zpool status ${ZPOOL_NAME} || exit 1
fi fi
fi
exit 0 exit 0