Add -f force option to zpios.sh it is passed on to zpool-create.sh

This commit is contained in:
Brian Behlendorf 2009-10-23 11:56:15 -07:00
parent 6d9d2f83b3
commit 8a119a354a
2 changed files with 11 additions and 5 deletions

View File

@ -31,6 +31,7 @@ DESCRIPTION:
OPTIONS:
-h Show this message
-v Verbose
-f Force everything
-p Enable profiling
-c Zpool configuration
-t Zpios test
@ -171,7 +172,7 @@ ZPIOS_OPTIONS=
ZPOOL_OPTIONS=""
ZFS_OPTIONS=""
while getopts 'hvpc:t:o:l:s:' OPTION; do
while getopts 'hvfpc:t:o:l:s:' OPTION; do
case $OPTION in
h)
usage
@ -181,6 +182,10 @@ while getopts 'hvpc:t:o:l:s:' OPTION; do
VERBOSE=1
VERBOSE_FLAG="-v"
;;
f)
FORCE=1
FORCE_FLAG="-f"
;;
p)
PROFILE=1
;;
@ -235,7 +240,8 @@ if [ ${VERBOSE} ]; then
fi
# Create the zpool configuration
${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} -p ${ZPOOL_NAME} -c ${ZPOOL_CONFIG} \
${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} ${FORCE_FLAG} \
-p ${ZPOOL_NAME} -c ${ZPOOL_CONFIG} \
-l "${ZPOOL_OPTIONS}" -s "${ZFS_OPTIONS}" || exit 1
if [ ${PROFILE} ]; then
@ -254,8 +260,8 @@ if [ ${VERBOSE} ]; then
fi
# Destroy the zpool configuration
${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} -p ${ZPOOL_NAME} \
-c ${ZPOOL_CONFIG} -d || exit 1
${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} ${FORCE_FLAG} \
-p ${ZPOOL_NAME} -c ${ZPOOL_CONFIG} -d || exit 1
# Unload the test module stack and wait for device removal
unload_modules

View File

@ -22,10 +22,10 @@ DESCRIPTION:
OPTIONS:
-h Show this message
-v Verbose
-f Force everything
-c Configuration for zpool
-p Name for zpool
-d Destroy zpool (default create)
-f Force everything
-l Additional zpool options
-s Additional zfs options