From 0ebae1634d01609a3bb81b25b84f33aeed388fae Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 7 Oct 2019 11:32:53 -0700 Subject: [PATCH] Modify sharenfs=on default behavior While it may sometimes be convenient to export an NFS filesystem with no_root_squash it should not be the default behavior. Align the default behavior with the Linux NFS server defaults. To restore the previous behavior use 'zfs set sharenfs="no_root_squash,..."'. Signed-off-by: Brian Behlendorf Issue #9397 --- lib/libshare/nfs.c | 5 +++-- man/man8/zfs.8 | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libshare/nfs.c b/lib/libshare/nfs.c index 5c8976e15aa6..7cc5ae43f500 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 09fa2831be96..3289e14d5ccd 100644 --- a/man/man8/zfs.8 +++ b/man/man8/zfs.8 @@ -1992,7 +1992,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