From owner-svn-src-all@FreeBSD.ORG Sun Feb 23 20:04:30 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7BADB7D2; Sun, 23 Feb 2014 20:04:30 +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 4A11710BC; Sun, 23 Feb 2014 20:04:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1NK4UbY005192; Sun, 23 Feb 2014 20:04:30 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1NK4TJU005189; Sun, 23 Feb 2014 20:04:29 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201402232004.s1NK4TJU005189@svn.freebsd.org> From: Bryan Drewery Date: Sun, 23 Feb 2014 20:04:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r262384 - in stable/10: etc/defaults etc/rc.d share/man/man5 X-SVN-Group: stable-10 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.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Feb 2014 20:04:30 -0000 Author: bdrewery Date: Sun Feb 23 20:04:29 2014 New Revision: 262384 URL: http://svnweb.freebsd.org/changeset/base/262384 Log: MFC r261931,r261932: Allow overriding rctl.conf(5) file location for /etc/rc.d/rctl Approved by: bapt (mentor, implicit) Modified: stable/10/etc/defaults/rc.conf stable/10/etc/rc.d/rctl stable/10/share/man/man5/rc.conf.5 Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/defaults/rc.conf ============================================================================== --- stable/10/etc/defaults/rc.conf Sun Feb 23 19:18:04 2014 (r262383) +++ stable/10/etc/defaults/rc.conf Sun Feb 23 20:04:29 2014 (r262384) @@ -663,6 +663,10 @@ newsyslog_flags="-CN" # Newsyslog flags mixer_enable="YES" # Run the sound mixer. opensm_enable="NO" # Opensm(8) for infiniband devices defaults to off +# 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: stable/10/etc/rc.d/rctl ============================================================================== --- stable/10/etc/rc.d/rctl Sun Feb 23 19:18:04 2014 (r262383) +++ stable/10/etc/rc.d/rctl Sun Feb 23 20:04:29 2014 (r262384) @@ -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 } Modified: stable/10/share/man/man5/rc.conf.5 ============================================================================== --- stable/10/share/man/man5/rc.conf.5 Sun Feb 23 19:18:04 2014 (r262383) +++ stable/10/share/man/man5/rc.conf.5 Sun Feb 23 20:04:29 2014 (r262384) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 25, 2013 +.Dd February 15, 2014 .Dt RC.CONF 5 .Os .Sh NAME @@ -4416,6 +4416,26 @@ interface if desired. Defines the total number of seconds to wait for link to become usable, polled at a 1-second interval. The default is 30. +.It Va rctl_enable +.Pq Vt bool +Set to +.Dq Li YES +to load +.Xr rctl 8 +rules from the defined ruleset. +The kernel must be built with +.Cd "options RACCT" +and +.Cd "options RCTL" . +.It Va rctl_rules +.Pq Vt str +Set to +.Pa /etc/rctl.conf +by default. +This variables contains the +.Xr rctl.conf 5 +ruleset to load for +.Xr rctl 8 . .El .Sh FILES .Bl -tag -width ".Pa /etc/defaults/rc.conf" -compact