From owner-svn-src-head@FreeBSD.ORG  Sat Feb 15 14:50:47 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C5820C51;
 Sat, 15 Feb 2014 14:50:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AF0751CB0;
 Sat, 15 Feb 2014 14:50:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1FEol48056675;
 Sat, 15 Feb 2014 14:50:47 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1FEolaV056357;
 Sat, 15 Feb 2014 14:50:47 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201402151450.s1FEolaV056357@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 15 Feb 2014 14:50:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261931 - in head/etc: defaults rc.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Sat, 15 Feb 2014 14:50:47 -0000

Author: bdrewery
Date: Sat Feb 15 14:50:47 2014
New Revision: 261931
URL: http://svnweb.freebsd.org/changeset/base/261931

Log:
  Allow overriding rctl.conf(5) file location for /etc/rc.d/rctl
  
  Reviewed by:	trasz
  Approved by:	bapt (mentor)
  MFC after:      1 week

Modified:
  head/etc/defaults/rc.conf
  head/etc/rc.d/rctl

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Sat Feb 15 14:46:48 2014	(r261930)
+++ head/etc/defaults/rc.conf	Sat Feb 15 14:50:47 2014	(r261931)
@@ -660,6 +660,10 @@ mixer_enable="YES"	# Run the sound mixer
 opensm_enable="NO"	# Opensm(8) for infiniband devices defaults to off
 casperd_enable="YES"	# casperd(8) daemon
 
+# rctl(8) requires kernel options RACCT and RCTL
+rctl_enable="NO"		# Load rctl(8) rules on boot
+rctl_rules="/etc/rctl.conf"	# rctl(8) ruleset. See rctl.conf(5).
+
 ##############################################################
 ### Jail Configuration (see rc.conf(5) manual page) ##########
 ##############################################################

Modified: head/etc/rc.d/rctl
==============================================================================
--- head/etc/rc.d/rctl	Sat Feb 15 14:46:48 2014	(r261930)
+++ head/etc/rc.d/rctl	Sat Feb 15 14:50:47 2014	(r261931)
@@ -15,7 +15,7 @@ stop_cmd="rctl_stop"
 
 rctl_start()
 {
-	if [ -f /etc/rctl.conf ]; then
+	if [ -f ${rctl_rules} ]; then
 		while read var comments
 		do
 			case ${var} in
@@ -25,7 +25,7 @@ rctl_start()
 				rctl -a "${var}"
 				;;
 			esac
-		done < /etc/rctl.conf
+		done < ${rctl_rules}
 	fi
 }