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

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

This commit is contained in:
Brian Behlendorf 2009-01-20 14:18:42 -08:00
parent 430d30f0ce a7f82bb7de
commit cdb24df8ce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/zpool-create.sh
View File

@ -24,11 +24,11 @@ EOF
check_config() { check_config() {
if [ ! -f ${ZPOOL_CONFIG} ]; then if [ ! -f ${ZPOOL_CONFIG} ]; then
local NAME=`basename ${ZPOOL_CONFIG} .cfg` local NAME=`basename ${ZPOOL_CONFIG} .sh`
ERROR="Unknown config '${NAME}', available configs are:\n" ERROR="Unknown config '${NAME}', available configs are:\n"
for CFG in `ls ${TOPDIR}/scripts/zpool-config/`; do for CFG in `ls ${TOPDIR}/scripts/zpool-config/`; do
local NAME=`basename ${CFG} .cfg` local NAME=`basename ${CFG} .sh`
ERROR="${ERROR}${NAME}\n" ERROR="${ERROR}${NAME}\n"
done done
@ -38,7 +38,7 @@ check_config() {
return 0 return 0
} }
ZPOOL_CONFIG=zpool_config.cfg ZPOOL_CONFIG=zpool_config.sh
ZPOOL_NAME=tank ZPOOL_NAME=tank
ZPOOL_DESTROY= ZPOOL_DESTROY=
@ -52,7 +52,7 @@ while getopts 'hvc:p:d' OPTION; do
VERBOSE=1 VERBOSE=1
;; ;;
c) c)
ZPOOL_CONFIG=${TOPDIR}/scripts/zpool-config/${OPTARG}.cfg ZPOOL_CONFIG=${TOPDIR}/scripts/zpool-config/${OPTARG}.sh
;; ;;
p) p)
ZPOOL_NAME=${OPTARG} ZPOOL_NAME=${OPTARG}