From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 10 Jun 2011 18:20:34 +0000 (-0700)
Subject: Pass -f option for import
X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=commitdiff_plain;h=da88a7fbe8876437c25f1006f91ca5595659b8d2;hp=1b9d8c340f89ca00b0bc99bb0f8a532e2e7a3a1d;p=zfs.git

Pass -f option for import

If a pool was not cleanly exported passing the -f flag may be required
at 'zpool import' time.  Since this test is simply validating that the
pool can be successfully imported in the absense of the cache file
always pass the -f to ensure it succeeds.  This failure was observed
under RHEL6.1.
---

diff --git a/scripts/zconfig.sh b/scripts/zconfig.sh
index b24528e..f635423 100755
--- a/scripts/zconfig.sh
+++ b/scripts/zconfig.sh
@@ -141,7 +141,7 @@ test_2() {
 	rm -f ${TMP_CACHE} || fail 5
 	${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 6
 	${ZPOOL} import | grep ${POOL_NAME} >/dev/null || fail 7
-	${ZPOOL} import ${POOL_NAME} || fail 8
+	${ZPOOL} import -f ${POOL_NAME} || fail 8
 	${ZPOOL} status ${POOL_NAME} >${TMP_FILE2} || fail 9
 	cmp ${TMP_FILE1} ${TMP_FILE2} || fail 10