From owner-svn-src-all@freebsd.org  Sat Feb  6 02:16:50 2016
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 1A524A9E4AB;
 Sat,  6 Feb 2016 02:16:50 +0000 (UTC)
 (envelope-from dteske@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 E1812BB0;
 Sat,  6 Feb 2016 02:16:49 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u162GmTf049838;
 Sat, 6 Feb 2016 02:16:48 GMT (envelope-from dteske@FreeBSD.org)
Received: (from dteske@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u162Gm6c049837;
 Sat, 6 Feb 2016 02:16:48 GMT (envelope-from dteske@FreeBSD.org)
Message-Id: <201602060216.u162Gm6c049837@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dteske set sender to
 dteske@FreeBSD.org using -f
From: Devin Teske <dteske@FreeBSD.org>
Date: Sat, 6 Feb 2016 02:16:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295342 - head/etc/defaults
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.20
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: Sat, 06 Feb 2016 02:16:50 -0000

Author: dteske
Date: Sat Feb  6 02:16:48 2016
New Revision: 295342
URL: https://svnweb.freebsd.org/changeset/base/295342

Log:
  Allow rc_conf_files to be redefined in rc.conf(5)
  
  With this change, it's possible to redefine rc_conf_files (e.g.,
  sysrc rc_conf_files+=/etc/rc.conf.other) and have the boot process
  pick up settings in extra files. The sysrc(8) tool can be used to
  query/enumerate/find/manage extra files configured in this manner.
  
  Relnotes:	yes

Modified:
  head/etc/defaults/rc.conf

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Fri Feb  5 23:50:15 2016	(r295341)
+++ head/etc/defaults/rc.conf	Sat Feb  6 02:16:48 2016	(r295342)
@@ -716,5 +716,17 @@ if [ -z "${source_rc_confs_defined}" ]; 
 				;;
 			esac
 		done
+		for i in ${rc_conf_files}; do
+			case ${sourced_files} in
+			*:$i:*)
+				;;
+			*)
+				sourced_files="${sourced_files}:$i:"
+				if [ -r $i ]; then
+					. $i
+				fi
+				;;
+			esac
+		done
 	}
 fi