Remove spl/zfs modules as part of cleanup

The idea behind the '-c' flag is to cleanup everything from a
previous test run which might cause the test script to fail.
This should also include removing the previously loaded module.
This makes it a little easier to run 'zconfig.sh -c', however
remember this is a test script and it will take all of your
other zpools offline for the purposes of the test.  This notion
has also been extended to the default 'make check' behavior.

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index cc910bab53249e53a07b2df5a3b3c1946208dbfe..3dc1e67fbefd075836fcbe8a19c8e360b2b95913 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -36,6 +36,7 @@ clean:
        done
 
 check:
+       @$(ZFS) -u
        @echo
        @echo -n "===================================="
        @echo -n " ZTEST "

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 8c6e67d54fd372ed0090b696445ac4b323c5c505..3e68eda65500095c41c932d5c0a2b386e9c5ccf6 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -732,6 +732,7 @@ clean:
        done
 
 check:
+       @$(ZFS) -u
        @echo
        @echo -n "===================================="
        @echo -n " ZTEST "

diff --git a/scripts/zconfig.sh b/scripts/zconfig.sh
index 674ec57fdf66b31bda2a6ac65c0762e304f0b9c2..31c3011c733f6690f73248a6ff53bde2e54eebd9 100755 (executable)
--- a/scripts/zconfig.sh
+++ b/scripts/zconfig.sh
@@ -60,6 +60,7 @@ fi
 
 # Perform pre-cleanup is requested
 if [ ${CLEANUP} ]; then
+       ${ZFS_SH} -u
        cleanup_md_devices
        cleanup_loop_devices
        rm -f /tmp/zpool.cache.*

diff --git a/scripts/zfault.sh b/scripts/zfault.sh
index 08d822538fd98a0ab358d94b4962dce574b542a1..7f774042446832493b46a3ed4bed060f14405304 100755 (executable)
--- a/scripts/zfault.sh
+++ b/scripts/zfault.sh
@@ -88,6 +88,7 @@ fi
 
 # Perform pre-cleanup is requested
 if [ ${CLEANUP} ]; then
+       ${ZFS_SH} -u
        cleanup_md_devices
        cleanup_loop_devices
        rm -f /tmp/zpool.cache.*