summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/libshare/nfs.c5
-rw-r--r--man/man8/zfs.82
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/libshare/nfs.c b/lib/libshare/nfs.c
index 5c8976e15..7cc5ae43f 100644
--- a/lib/libshare/nfs.c
+++ b/lib/libshare/nfs.c
@@ -387,9 +387,10 @@ get_linux_shareopts(const char *shareopts, char **plinux_opts)
*plinux_opts = NULL;
- /* default options for Solaris shares */
+ /* no_subtree_check - Default as of nfs-utils v1.1.0 */
(void) add_linux_shareopt(plinux_opts, "no_subtree_check", NULL);
- (void) add_linux_shareopt(plinux_opts, "no_root_squash", NULL);
+
+ /* mountpoint - Restrict exports to ZFS mountpoints */
(void) add_linux_shareopt(plinux_opts, "mountpoint", NULL);
rc = foreach_nfs_shareopt(shareopts, get_linux_shareopts_cb,
diff --git a/man/man8/zfs.8 b/man/man8/zfs.8
index ee7a111ed..e391b9810 100644
--- a/man/man8/zfs.8
+++ b/man/man8/zfs.8
@@ -1993,7 +1993,7 @@ If the property is set to
.Sy on ,
the dataset is shared using the default options:
.Pp
-.Em sec=sys,rw,crossmnt,no_subtree_check,no_root_squash
+.Em sec=sys,rw,crossmnt,no_subtree_check
.Pp
See
.Xr exports 5