]> granicus.if.org Git - zfs/commitdiff
Pass -f option for import
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 10 Jun 2011 18:20:34 +0000 (11:20 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 10 Jun 2011 18:21:31 +0000 (11:21 -0700)
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.

scripts/zconfig.sh

index b24528ead7b616fabb7da84c3c249f33cf48de23..f635423dd292220ac101ee9493863b3caa8a9db7 100755 (executable)
@@ -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