From 8a9d1b7f5df1fc9be361f6d4adca10d2344994b6 Mon Sep 17 00:00:00 2001
From: rmacklem <rmacklem@FreeBSD.org>
Date: Thu, 7 Jul 2011 20:59:42 +0000
Subject: 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)
---
 etc/rc.d/nfsd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'etc')

diff --git a/etc/rc.d/nfsd b/etc/rc.d/nfsd
index f0a65ba..8dae57c 100755
--- a/etc/rc.d/nfsd
+++ b/etc/rc.d/nfsd
@@ -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'
-- 
cgit v1.1