From owner-svn-src-stable@FreeBSD.ORG  Sun Feb 19 22:24:02 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1930A1065701;
	Sun, 19 Feb 2012 22:24:02 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 02FD18FC12;
	Sun, 19 Feb 2012 22:24:02 +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 q1JMO1k6017866;
	Sun, 19 Feb 2012 22:24:01 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1JMO1K0017864;
	Sun, 19 Feb 2012 22:24:01 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201202192224.q1JMO1K0017864@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 19 Feb 2012 22:24:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231917 - stable/8/etc/rc.d
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Feb 2012 22:24:02 -0000

Author: dougb
Date: Sun Feb 19 22:24:01 2012
New Revision: 231917
URL: http://svn.freebsd.org/changeset/base/231917

Log:
  Remove the last wrapper around force_depend ... missed in the r231667 MFC
  
  This is a direct commit to stable/8 because the file differs from that
  in HEAD
  
  Approved by:	re (kib)

Modified:
  stable/8/etc/rc.d/nfsd

Modified: stable/8/etc/rc.d/nfsd
==============================================================================
--- stable/8/etc/rc.d/nfsd	Sun Feb 19 20:15:13 2012	(r231916)
+++ stable/8/etc/rc.d/nfsd	Sun Feb 19 22:24:01 2012	(r231917)
@@ -25,11 +25,7 @@ nfsd_precmd()
 		#
 		rc_flags="-e ${nfs_server_flags}"
 
-		if ! checkyesno nfsuserd_enable  && \
-		    ! /etc/rc.d/nfsuserd forcestatus 1>/dev/null 2>&1
-		then
-			force_depend nfsuserd || return 1
-		fi
+		force_depend nfsuserd || return 1
 	else
 		rc_flags="${nfs_server_flags}"