summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2016-08-30 18:50:11 -0700
committerBrian Behlendorf <[email protected]>2016-08-31 14:31:37 -0700
commit3f10fe07d645166d7513448feedd8e3ef3111a12 (patch)
tree0104f79171b52a0752c931928e45e2844938ce5b
parent82ab6848ccff8fa42da56a2b5c74c767f8ad8fb0 (diff)
Update zpool_import_001_pos
Older versions of blkid may not promptly detect ZFS labels when they're located on partitions. In order to ensure this test passes reliably always perform a scan of default search paths (-s). Signed-off-by: Brian Behlendorf <[email protected]> Signed-off-by: liaoyuxiangqin <[email protected]> Closes #4987 Closes #5047
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_001_pos.ksh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_001_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_001_pos.ksh
index 3562b045b..ef3586540 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_001_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_001_pos.ksh
@@ -52,7 +52,7 @@
verify_runnable "global"
set -A pools "$TESTPOOL" "$TESTPOOL1"
-set -A devs "" "-d $DEVICE_DIR"
+set -A devs " -s" "-d $DEVICE_DIR"
set -A options "" "-R $ALTER_ROOT"
set -A mtpts "$TESTDIR" "$TESTDIR1"