From 0289edb7e6a25de094811841ff90c045305e8c4a Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 16 Jan 2009 12:23:53 -0800
Subject: [PATCH] Update to use the zpool-create.sh script

---
 scripts/zpios.sh | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/scripts/zpios.sh b/scripts/zpios.sh
index 740ec8bdb9..844ab55153 100755
--- a/scripts/zpios.sh
+++ b/scripts/zpios.sh
@@ -90,23 +90,6 @@ print_stats() {
 	fi
 }
 
-check_config() {
-
-	if [ ! -f ${ZPOOL_CONFIG} ]; then
-		local NAME=`basename ${ZPOOL_CONFIG} .cfg`
-		ERROR="Unknown config '${NAME}', available configs are:\n"
-
-		for CFG in `ls ${TOPDIR}/scripts/zpool-config/`; do
-			local NAME=`basename ${CFG} .cfg`
-			ERROR="${ERROR}${NAME}\n"
-		done
-
-		return 1
-	fi
-
-	return 0
-}
-
 check_test() {
 
 	if [ ! -f ${ZPIOS_TEST} ]; then
@@ -141,7 +124,7 @@ while getopts 'hvpc:t:' OPTION; do
 		PROFILE=1
 		;;
 	c)
-		ZPOOL_CONFIG=${TOPDIR}/scripts/zpool-config/${OPTARG}.cfg
+		ZPOOL_CONFIG=${OPTARG}
 		;;
 	t)
 		ZPIOS_TEST=${TOPDIR}/scripts/zpios-test/${OPTARG}.cfg
@@ -157,8 +140,7 @@ if [ $(id -u) != 0 ]; then
         die "Must run as root"
 fi
 
-# Validate your using a known config and test
-check_config || die "${ERROR}"
+# Validate your using a known test
 check_test || die "${ERROR}"
 
 # Pull in the zpios test module is not loaded.  If this fails it is
@@ -175,8 +157,8 @@ if [ ${VERBOSE} ]; then
 	print_zfs_info
 fi
 
-# Source the zpool configuration
-. ${ZPOOL_CONFIG}
+# Create the zpool configuration
+./zpool-create.sh -c ${ZPOOL_CONFIG} || exit 1
 
 msg "${CMDDIR}/zpool/zpool status zpios"
 ${CMDDIR}/zpool/zpool status zpios || exit 1