svn commit: r324371 - stable/10/etc/defaults

[Devin Teske]

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