X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fzconfig.sh;h=80f7e45701f04c58911388f23403568968e61c51;hb=6ba3b44614fa6482bd2d7363964b65f0289b0f4f;hp=b24528ead7b616fabb7da84c3c249f33cf48de23;hpb=3fce1d0962dd28d094589f6d5c3f88a1db12b7cb;p=zfs.git

diff --git a/scripts/zconfig.sh b/scripts/zconfig.sh
index b24528e..80f7e45 100755
--- a/scripts/zconfig.sh
+++ b/scripts/zconfig.sh
@@ -60,6 +60,9 @@ if [ $(id -u) != 0 ]; then
 	die "Must run as root"
 fi
 
+# Initialize the test suite
+init
+
 # Perform pre-cleanup is requested
 if [ ${CLEANUP} ]; then
 	${ZFS_SH} -u
@@ -141,7 +144,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