From 47770d30f205b81ece1f60760f3edb5c04574e6e Mon Sep 17 00:00:00 2001 From: bunder2015 Date: Tue, 27 Jun 2017 13:06:07 -0400 Subject: [PATCH] Fix zpool_add_005_pos Under Linux the existence of a block device in /etc/fstab is not sufficient to prevent the use of the force flag. Without the force flag a warning will be printed that the device has a filesystem of a given type. Providing the force option will overwrite that filesystem as long as it is not actively mounted. Reviewed-by: Brian Behlendorf Reviewed-by: George Melikov Reviewed-by: Giuseppe Di Natale Tested-by: bunder2015 Signed-off-by: bunder2015 Closes #6267 Closes #6272 --- .../functional/cli_root/zpool_add/zpool_add_005_pos.ksh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_005_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_005_pos.ksh index a7c7bc04b..1516cb20a 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_005_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_005_pos.ksh @@ -80,7 +80,11 @@ log_must poolexists "$TESTPOOL1" unset NOINUSE_CHECK log_mustnot zpool add -f "$TESTPOOL" ${disk}${SLICE_PREFIX}${SLICE1} log_mustnot zpool add -f "$TESTPOOL" $mnttab_dev -log_mustnot zpool add -f "$TESTPOOL" $vfstab_dev +if is_linux; then + log_mustnot zpool add "$TESTPOOL" $vfstab_dev +else + log_mustnot zpool add -f "$TESTPOOL" $vfstab_dev +fi if ! is_linux; then log_must echo "y" | newfs ${DEV_DSKDIR}/$dump_dev > /dev/null 2>&1