diff options
| author | trasz <trasz@FreeBSD.org> | 2015-04-18 16:08:06 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2015-04-18 16:08:06 +0000 |
| commit | 7ba042082b083de7e31762c9a6b4ab4975bb2a2f (patch) | |
| tree | 81ef82396e83699122d91168cd0e1600584e4367 /etc/rc.d | |
| parent | f5cd924224bb3a40d1410f9ca7aa6b158f7a4646 (diff) | |
| download | FreeBSD-src-7ba042082b083de7e31762c9a6b4ab4975bb2a2f.zip FreeBSD-src-7ba042082b083de7e31762c9a6b4ab4975bb2a2f.tar.gz | |
Remove some oldnfs remnants.
Differential Revision: https://reviews.freebsd.org/D2287
Reviewed by: rmacklem@
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'etc/rc.d')
| -rwxr-xr-x | etc/rc.d/mountd | 6 | ||||
| -rwxr-xr-x | etc/rc.d/nfsd | 51 |
2 files changed, 18 insertions, 39 deletions
diff --git a/etc/rc.d/mountd b/etc/rc.d/mountd index f3ebfdb..a7ad6c2 100755 --- a/etc/rc.d/mountd +++ b/etc/rc.d/mountd @@ -33,12 +33,6 @@ mountd_precmd() fi fi - # If oldnfs_server_enable is yes, force use of the old NFS server - # - if checkyesno oldnfs_server_enable; then - rc_flags="-o ${rc_flags}" - fi - if checkyesno zfs_enable; then rc_flags="${rc_flags} /etc/exports /etc/zfs/exports" fi diff --git a/etc/rc.d/nfsd b/etc/rc.d/nfsd index e067ad1..8c67308 100755 --- a/etc/rc.d/nfsd +++ b/etc/rc.d/nfsd @@ -19,40 +19,25 @@ sig_stop="USR1" nfsd_precmd() { - if checkyesno oldnfs_server_enable; then - rc_flags="-o ${nfs_server_flags}" - - # Load the module now, so that the vfs.nfsrv sysctl - # oids are available. - load_kld nfsserver - - if checkyesno nfs_reserved_port_only; then - echo 'NFS on reserved port only=YES' - sysctl vfs.nfsrv.nfs_privport=1 > /dev/null - else - sysctl vfs.nfsrv.nfs_privport=0 > /dev/null - fi + rc_flags="${nfs_server_flags}" + + # Load the modules now, so that the vfs.nfsd sysctl + # oids are available. + load_kld nfsd + + if checkyesno nfs_reserved_port_only; then + echo 'NFS on reserved port only=YES' + sysctl vfs.nfsd.nfs_privport=1 > /dev/null + else + sysctl vfs.nfsd.nfs_privport=0 > /dev/null + 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 - rc_flags="${nfs_server_flags}" - - # Load the modules now, so that the vfs.nfsd sysctl - # oids are available. - load_kld nfsd - - if checkyesno nfs_reserved_port_only; then - echo 'NFS on reserved port only=YES' - sysctl vfs.nfsd.nfs_privport=1 > /dev/null - else - sysctl vfs.nfsd.nfs_privport=0 > /dev/null - 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 - fi + echo 'NFSv4 is disabled' + sysctl vfs.nfsd.server_max_nfsvers=3 > /dev/null fi force_depend rpcbind || return 1 |
