From b11375d74a18945d247f0f98e2d599628bd26e2a Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Thu, 20 Feb 2020 11:12:24 -0500 Subject: [PATCH] ZTS: Check the right mount options on FreeBSD FreeBSD does not support the "devices" and "nodevices" mount options. Do not check these options on FreeBSD. Reviewed-by: John Kennedy Reviewed-by: Brian Behlendorf Signed-off-by: Ryan Moeller Closes #10028 --- .../cli_root/zfs_mount/zfs_mount_007_pos.ksh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_007_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_007_pos.ksh index ee5d304514..409dd06d7f 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_007_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_007_pos.ksh @@ -62,7 +62,10 @@ log_assert "Verify '-o' will set filesystem property temporarily, " \ "without affecting the property that is stored on disk." log_onexit cleanup -set -A properties "atime" "devices" "exec" "readonly" "setuid" +set -A properties "atime" "exec" "readonly" "setuid" +if ! is_freebsd; then + properties+=("devices") +fi # # Get the specified filesystem property reverse mount option. @@ -78,16 +81,21 @@ function get_reverse_option # Define property value: "reverse if value=on" "reverse if value=off" if is_linux; then set -A values "noatime" "atime" \ - "nodev" "dev" \ "noexec" "exec" \ "rw" "ro" \ - "nosuid" "suid" - else + "nosuid" "suid" \ + "nodev" "dev" + elif is_freebsd; then set -A values "noatime" "atime" \ - "nodevices" "devices" \ "noexec" "exec" \ "rw" "ro" \ "nosetuid" "setuid" + else + set -A values "noatime" "atime" \ + "noexec" "exec" \ + "rw" "ro" \ + "nosetuid" "setuid" \ + "nodevices" "devices" fi typeset -i i=0