From owner-svn-src-all@freebsd.org  Thu Apr  6 00:15:19 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65EB8D309DC;
 Thu,  6 Apr 2017 00:15:19 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2D6319DA;
 Thu,  6 Apr 2017 00:15:19 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v360FIp3047703;
 Thu, 6 Apr 2017 00:15:18 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v360FIlG047702;
 Thu, 6 Apr 2017 00:15:18 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201704060015.v360FIlG047702@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Thu, 6 Apr 2017 00:15:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316546 - head/etc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Apr 2017 00:15:19 -0000

Author: cy
Date: Thu Apr  6 00:15:18 2017
New Revision: 316546
URL: https://svnweb.freebsd.org/changeset/base/316546

Log:
  Revert r316516. des@ asked that r316516 be reverted so that he can spend
  a little more time getting r316487 right.
  
  Requested by:	des@

Modified:
  head/etc/rc.subr

Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr	Thu Apr  6 00:07:11 2017	(r316545)
+++ head/etc/rc.subr	Thu Apr  6 00:15:18 2017	(r316546)
@@ -929,9 +929,6 @@ run_rc_command()
 			eval ${rcvar}=YES
 		fi
 	fi
-	if ! checkyesno rc_force; then
-		rc_force=
-	fi
 	debug "_rc_prefix=${_rc_prefix}"
 
 	eval _override_command=\$${name}_program