Skip to content

Commit

Permalink
ZTS: Fix verify_fs_mount in delegate_common.kshlib
Browse files Browse the repository at this point in the history
verify_fs_mount expects the dataset to remain unmounted after
updating the mountpoint property in delegate_common.kshlib.

This commit updates verify_fs_mount and uses nomount parameter
for zfs set to update the mountpoint property without mounting
the dataset.

This fixes the zfs_allow_010_pos test case, which was failing on
FreeBSD after the behavior update in setting the mountpoint
property.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Umer Saleem <usaleem@ixsystems.com>
Closes #15376
  • Loading branch information
usaleem-ix authored Oct 10, 2023
1 parent 954a380 commit 250349f
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ function verify_fs_mount
fi

if ! ismounted $fs ; then
log_must zfs set mountpoint=$newmntpt $fs
log_must zfs set -u mountpoint=$newmntpt $fs
log_must rm -rf $newmntpt
log_must mkdir $newmntpt

Expand All @@ -878,7 +878,7 @@ function verify_fs_mount
fi
log_must zfs umount $fs
log_must rm -rf $newmntpt
log_must zfs set mountpoint=$mntpt $fs
log_must zfs set -u mountpoint=$mntpt $fs
fi

return 0
Expand Down

0 comments on commit 250349f

Please sign in to comment.