From 3f10fe07d645166d7513448feedd8e3ef3111a12 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 30 Aug 2016 18:50:11 -0700 Subject: [PATCH] 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 Signed-off-by: liaoyuxiangqin Closes #4987 Closes #5047 --- .../functional/cli_root/zpool_import/zpool_import_001_pos.ksh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3562b045b5..ef35865406 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"