ZTS: Fix verify_fs_mount in delegate_common.kshlib
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
This commit is contained in:
parent
954a380e19
commit
250349ffff
|
@ -861,7 +861,7 @@ function verify_fs_mount
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! ismounted $fs ; then
|
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 rm -rf $newmntpt
|
||||||
log_must mkdir $newmntpt
|
log_must mkdir $newmntpt
|
||||||
|
|
||||||
|
@ -878,7 +878,7 @@ function verify_fs_mount
|
||||||
fi
|
fi
|
||||||
log_must zfs umount $fs
|
log_must zfs umount $fs
|
||||||
log_must rm -rf $newmntpt
|
log_must rm -rf $newmntpt
|
||||||
log_must zfs set mountpoint=$mntpt $fs
|
log_must zfs set -u mountpoint=$mntpt $fs
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
|
|
Loading…
Reference in New Issue