From 544b7bafc9b515217ae6aa4678c79abc896a3d5b Mon Sep 17 00:00:00 2001
From: dteske <dteske@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Fri, 6 Oct 2017 18:22:36 +0000
Subject: [PATCH] MFC SVN r295342-295344

Differential Revision:	https://reviews.freebsd.org/D12568
Submitted by:	Vinicius Zava (egypcio at googlemail.com)
Reviewed by:	allanjude


git-svn-id: svn://svn.freebsd.org/base/stable/10@324371 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 etc/defaults/rc.conf | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index f8e454007..4c1b23e5d 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -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
-- 
2.42.0