svn commit: r223847 - head/etc/rc.d

[Rick Macklem]

Author: rmacklem
Date: Thu Jul  7 20:59:42 2011
New Revision: 223847
URL: http://svn.freebsd.org/changeset/base/223847

Log:
  Fix the /etc/rc.d/nfsd script so that it no longer uses
  the /etc/rc.d/nfsserver script to load the old nfs server
  module.
  
  Tested by:	sgk at troutmask.apl.washington.edu
  Reviewed by:	rc (hrs)

Modified:
  head/etc/rc.d/nfsd

Modified: head/etc/rc.d/nfsd
==============================================================================
--- head/etc/rc.d/nfsd	Thu Jul  7 20:02:09 2011	(r223846)
+++ head/etc/rc.d/nfsd	Thu Jul  7 20:59:42 2011	(r223847)
@@ -22,9 +22,9 @@ nfsd_precmd()
 	if checkyesno oldnfs_server_enable; then
 		rc_flags="-o ${nfs_server_flags}"
 
-		if ! sysctl vfs.nfsrv >/dev/null 2>&1; then
-			force_depend nfsserver || return 1
-		fi
+		# 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'