svn commit: r320516 - projects/pnfs-planb-server-stable11/etc/rc.d

[Rick Macklem]

Author: rmacklem
Date: Fri Jun 30 22:13:28 2017
New Revision: 320516
URL: https://svnweb.freebsd.org/changeset/base/320516

Log:
  Update the nfsd /etc/rc.d script to not force nfsuserd startup and
  to depend on mountcritremote. The latter makes sure that the DS mounts
  are done before the nfsd starts (I think?).

Modified:
  projects/pnfs-planb-server-stable11/etc/rc.d/nfsd

Modified: projects/pnfs-planb-server-stable11/etc/rc.d/nfsd
==============================================================================
--- projects/pnfs-planb-server-stable11/etc/rc.d/nfsd	Fri Jun 30 22:10:17 2017	(r320515)
+++ projects/pnfs-planb-server-stable11/etc/rc.d/nfsd	Fri Jun 30 22:13:28 2017	(r320516)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: nfsd
-# REQUIRE: mountd hostname gssd nfsuserd
+# REQUIRE: mountcritremote mountd hostname gssd
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr
@@ -33,8 +33,7 @@ nfsd_precmd()
 		sysctl vfs.nfsd.nfs_privport=0 > /dev/null
 	fi
 
-	if checkyesno nfsv4_server_enable || \
-	    checkyesno nfs_server_managegids; then
+	if checkyesno nfs_server_managegids; then
 		force_depend nfsuserd || err 1 "Cannot run nfsuserd"
 	fi