Illumos #3639 zpool.cache should skip over readonly pools

[zfs.git] / scripts / zpios-sanity.sh

diff --git a/scripts/zpios-sanity.sh b/scripts/zpios-sanity.sh
index c8e9bb5..0f44115 100755 (executable)
--- a/scripts/zpios-sanity.sh
+++ b/scripts/zpios-sanity.sh
@@ -62,8 +62,13 @@ 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
+       cleanup_md_devices
        cleanup_loop_devices
        rm -f /tmp/zpool.cache.*
 fi
@@ -148,6 +153,9 @@ DANGEROUS_CONFIGS=(                                 \
        dm0-raid0                                       \
 )
 
+TMP_CACHE=`mktemp -p /tmp zpool.cache.XXXXXXXX`
+${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || die "Unable to load modules"
+
 for CONFIG in ${SAFE_CONFIGS[*]}; do
        zpios_test $CONFIG tiny
 done
@@ -158,4 +166,6 @@ if [ ${DANGEROUS} ]; then
        done
 fi
 
+${ZFS_SH} -u
+
 exit $FAILS