D15689.id43418.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D15689.id43418.diff
View Options

	Index: etc/defaults/rc.conf
	===================================================================
	--- etc/defaults/rc.conf
	+++ etc/defaults/rc.conf
	@@ -60,6 +60,7 @@
	local_startup="/usr/local/etc/rc.d" # startup script dirs.
	script_name_sep=" " # Change if your startup scripts' names contain spaces
	rc_conf_files="/etc/rc.conf /etc/rc.conf.local"
	+rc_conf_dirs="/etc/rc.conf.d"

	# ZFS support
	zfs_enable="NO" # Set to YES to automatically mount ZFS file systems
	@@ -707,7 +708,14 @@
	if [ -z "${source_rc_confs_defined}" ]; then
	source_rc_confs_defined=yes
	source_rc_confs() {
	- local i sourced_files
	+ local i d sourced_files
	+
	+ for d in ${rc_conf_dirs} ; do
	+ for i in $(find ${d} -type f) ; do
	+ sourced_files="${sourced_files}:$i:"
	+ . $i
	+ done
	+ done
	for i in ${rc_conf_files}; do
	case ${sourced_files} in
	:$i:)
	@@ -721,6 +729,13 @@
	esac
	done
	# Re-do process to pick up [possibly] redefined $rc_conf_files
	+ for d in ${rc_conf_dirs} ; do
	+ for i in $(find ${d} -type f) ; do
	+ sourced_files="${sourced_files}:$i:"
	+ . $i
	+ done
	+ done
	+
	for i in ${rc_conf_files}; do
	case ${sourced_files} in
	:$i:)