diff options
author | Renato Botelho <renato@netgate.com> | 2015-12-17 11:13:55 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-12-17 11:13:55 -0200 |
commit | 02eb529700650bb0a6247479d6c83d206e0a5985 (patch) | |
tree | f2dd3e19d51cd578d33f2c231100e5248a937ad2 /etc | |
parent | 4e66c4599e6123e69ca54036271685a3dde9a929 (diff) | |
parent | 5952006acb1f0577732ac15f481976227292807f (diff) | |
download | FreeBSD-src-02eb529700650bb0a6247479d6c83d206e0a5985.zip FreeBSD-src-02eb529700650bb0a6247479d6c83d206e0a5985.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'etc')
-rw-r--r-- | etc/defaults/rc.conf | 1 | ||||
-rw-r--r-- | etc/mtree/BSD.tests.dist | 2 | ||||
-rwxr-xr-x | etc/rc.d/nfsd | 6 | ||||
-rwxr-xr-x | etc/rc.d/nfsuserd | 9 |
4 files changed, 17 insertions, 1 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index f455bc3..d4e9701 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -330,6 +330,7 @@ nfs_access_cache="60" # Client cache timeout in seconds nfs_server_enable="NO" # This host is an NFS server (or NO). oldnfs_server_enable="NO" # Run the old NFS server (YES/NO). nfs_server_flags="-u -t" # Flags to nfsd (if enabled). +nfs_server_managegids="NO" # The NFS server maps gids for AUTH_SYS (or NO). mountd_enable="NO" # Run mountd (or NO). mountd_flags="-r" # Flags to mountd (if NFS server enabled). weak_mountd_authentication="NO" # Allow non-root mount requests to be served. diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index b73ab33..41e8421 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -6,6 +6,8 @@ /set type=dir uname=root gname=wheel mode=0755 . bin + cat + .. chown .. date diff --git a/etc/rc.d/nfsd b/etc/rc.d/nfsd index e067ad1..64e5a73 100755 --- a/etc/rc.d/nfsd +++ b/etc/rc.d/nfsd @@ -46,9 +46,13 @@ nfsd_precmd() sysctl vfs.nfsd.nfs_privport=0 > /dev/null fi + if checkyesno nfsv4_server_enable || \ + checkyesno nfs_server_managegids; then + force_depend nfsuserd || err 1 "Cannot run nfsuserd" + fi + if checkyesno nfsv4_server_enable; then sysctl vfs.nfsd.server_max_nfsvers=4 > /dev/null - force_depend nfsuserd || err 1 "Cannot run nfsuserd" else echo 'NFSv4 is disabled' sysctl vfs.nfsd.server_max_nfsvers=3 > /dev/null diff --git a/etc/rc.d/nfsuserd b/etc/rc.d/nfsuserd index 52246bb..d98d16e 100755 --- a/etc/rc.d/nfsuserd +++ b/etc/rc.d/nfsuserd @@ -15,5 +15,14 @@ command="/usr/sbin/${name}" sig_stop="USR1" load_rc_config $name +start_precmd="nfsuserd_precmd" + +nfsuserd_precmd() +{ + if checkyesno nfs_server_managegids; then + rc_flags="-manage-gids ${nfsuserd_flags}" + fi + return 0 +} run_rc_command "$1" |