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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/zpios.sh
View File

@ -31,6 +31,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
@ -171,7 +172,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
@ -181,6 +182,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
;; ;;
@ -235,7 +240,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
@ -254,8 +260,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

2
scripts/zpool-create.sh
View File

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