Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-05-18 15:12:34 -07:00
commit d1f5013be8
1 changed files with 10 additions and 4 deletions

View File

@ -33,6 +33,7 @@ DESCRIPTION:
OPTIONS: OPTIONS:
-h Show this message -h Show this message
-v Verbose -v Verbose
-f Force everything
-p Enable profiling -p Enable profiling
-c Zpool configuration -c Zpool configuration
-t Zpios test -t Zpios test
@ -173,7 +174,7 @@ ZPIOS_OPTIONS=
ZPOOL_OPTIONS="" ZPOOL_OPTIONS=""
ZFS_OPTIONS="" ZFS_OPTIONS=""
while getopts 'hvpc:t:o:l:s:' OPTION; do while getopts 'hvfpc:t:o:l:s:' OPTION; do
case $OPTION in case $OPTION in
h) h)
usage usage
@ -183,6 +184,10 @@ while getopts 'hvpc:t:o:l:s:' OPTION; do
VERBOSE=1 VERBOSE=1
VERBOSE_FLAG="-v" VERBOSE_FLAG="-v"
;; ;;
f)
FORCE=1
FORCE_FLAG="-f"
;;
p) p)
PROFILE=1 PROFILE=1
;; ;;
@ -237,7 +242,8 @@ if [ ${VERBOSE} ]; then
fi fi
# Create the zpool configuration # 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 -l "${ZPOOL_OPTIONS}" -s "${ZFS_OPTIONS}" || exit 1
if [ ${PROFILE} ]; then if [ ${PROFILE} ]; then
@ -256,8 +262,8 @@ if [ ${VERBOSE} ]; then
fi fi
# Destroy the zpool configuration # Destroy the zpool configuration
${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} -p ${ZPOOL_NAME} \ ${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} ${FORCE_FLAG} \
-c ${ZPOOL_CONFIG} -d || exit 1 -p ${ZPOOL_NAME} -c ${ZPOOL_CONFIG} -d || exit 1
# Unload the test module stack and wait for device removal # Unload the test module stack and wait for device removal
unload_modules unload_modules