From a7c358845b1fdfc60b5f1f70d9d6a4ab87f95fa4 Mon Sep 17 00:00:00 2001 From: Igor K Date: Thu, 28 Nov 2019 01:55:43 +0300 Subject: [PATCH] ZTS: Fix attach-o_ashift.ksh for multiple platforms The `-o ashift` option must appear after attach to be properly interpreted by getopt(3) on all platforms. Reviewed-by: Richard Elling Reviewed-by: Kjeld Schouten Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Reviewed-by: Ryan Moeller Signed-off-by: Igor Kozhukhov Closes #9636 --- .../tests/functional/cli_root/zpool_attach/attach-o_ashift.ksh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_attach/attach-o_ashift.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_attach/attach-o_ashift.ksh index fd33fb9506a9..3c3706ff390c 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_attach/attach-o_ashift.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_attach/attach-o_ashift.ksh @@ -92,7 +92,7 @@ typeset badvals=("off" "on" "1" "8" "17" "1b" "ff" "-") for badval in ${badvals[@]} do log_must zpool create $TESTPOOL1 $disk1 - log_mustnot zpool attach $TESTPOOL1 -o ashift=$badval $disk1 $disk2 + log_mustnot zpool attach -o ashift=$badval $TESTPOOL1 $disk1 $disk2 log_must zpool destroy $TESTPOOL1 log_must zpool labelclear $disk1 log_mustnot zpool labelclear $disk2