From owner-svn-src-head@FreeBSD.ORG  Thu Jul  7 20:59:42 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 96F2B1065673;
	Thu,  7 Jul 2011 20:59:42 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 874F48FC17;
	Thu,  7 Jul 2011 20:59:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p67KxgM9078546;
	Thu, 7 Jul 2011 20:59:42 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p67KxgTI078544;
	Thu, 7 Jul 2011 20:59:42 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201107072059.p67KxgTI078544@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Thu, 7 Jul 2011 20:59:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223847 - head/etc/rc.d
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jul 2011 20:59:42 -0000

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'