From owner-svn-src-head@FreeBSD.ORG  Tue Aug 26 22:33:34 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 D1B2D2AE;
 Tue, 26 Aug 2014 22:33:34 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BE076390A;
 Tue, 26 Aug 2014 22:33:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QMXYoG056792;
 Tue, 26 Aug 2014 22:33:34 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QMXYfd056791;
 Tue, 26 Aug 2014 22:33:34 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201408262233.s7QMXYfd056791@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 26 Aug 2014 22:33:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270676 - 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-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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: Tue, 26 Aug 2014 22:33:34 -0000

Author: bapt
Date: Tue Aug 26 22:33:34 2014
New Revision: 270676
URL: http://svnweb.freebsd.org/changeset/base/270676

Log:
  Allow to configure services from ${LOCALBASE}/etc/rc.conf.d
  
  Reviewed by:	bdrewery
  MFC after:	1 week
  Relnotes:	yes

Modified:
  head/etc/rc.subr

Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr	Tue Aug 26 22:20:02 2014	(r270675)
+++ head/etc/rc.subr	Tue Aug 26 22:33:34 2014	(r270676)
@@ -1301,6 +1301,10 @@ load_rc_config()
 			fi
 		done
 	fi
+	if [ -f ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" ]; then
+		debug "Sourcing ${LOCALBASE:-/usr/local}/etc/rc.conf.d/${_name}"
+		. ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name"
+	fi
 
 	# Set defaults if defined.
 	for _var in $rcvar; do