From owner-svn-src-stable-10@freebsd.org  Fri Oct  6 18:22:38 2017
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 271BDE3DEE2;
 Fri,  6 Oct 2017 18:22:38 +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 E53F269881;
 Fri,  6 Oct 2017 18:22:37 +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 v96IMa9m098420;
 Fri, 6 Oct 2017 18:22:36 GMT (envelope-from dteske@FreeBSD.org)
Received: (from dteske@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v96IMarX098419;
 Fri, 6 Oct 2017 18:22:36 GMT (envelope-from dteske@FreeBSD.org)
Message-Id: <201710061822.v96IMarX098419@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: Fri, 6 Oct 2017 18:22:36 +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: r324371 - stable/10/etc/defaults
X-SVN-Group: stable-10
X-SVN-Commit-Author: dteske
X-SVN-Commit-Paths: stable/10/etc/defaults
X-SVN-Commit-Revision: 324371
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Oct 2017 18:22:38 -0000

Author: dteske
Date: Fri Oct  6 18:22:36 2017
New Revision: 324371
URL: https://svnweb.freebsd.org/changeset/base/324371

Log:
  MFC SVN r295342-295344
  
  Differential Revision:	https://reviews.freebsd.org/D12568
  Submitted by:	Vinicius Zava (egypcio at googlemail.com)
  Reviewed by:	allanjude

Modified:
  stable/10/etc/defaults/rc.conf
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/defaults/rc.conf
==============================================================================
--- stable/10/etc/defaults/rc.conf	Fri Oct  6 17:30:18 2017	(r324370)
+++ stable/10/etc/defaults/rc.conf	Fri Oct  6 18:22:36 2017	(r324371)
@@ -723,5 +723,18 @@ if [ -z "${source_rc_confs_defined}" ]; then
 				;;
 			esac
 		done
+		# Re-do process to pick up [possibly] redefined $rc_conf_files
+		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