X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fzpios-sanity.sh;h=fcd91b6e6a3f1815730e115aa944370171495159;hb=2e08aedba456dccddf6418908a55014e56cad226;hp=c8e9bb5834cad75ea2fec99824b5887c03257995;hpb=2ea9dc40f88ed84bc3e8022b91dd33cbce94653f;p=zfs.git

diff --git a/scripts/zpios-sanity.sh b/scripts/zpios-sanity.sh
index c8e9bb5..fcd91b6 100755
--- a/scripts/zpios-sanity.sh
+++ b/scripts/zpios-sanity.sh
@@ -64,6 +64,8 @@ fi
 
 # 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 +150,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 +163,6 @@ if [ ${DANGEROUS} ]; then
 	done
 fi
 
+${ZFS_SH} -u
+
 exit $FAILS