The attached patch does two things:

1) Add /etc/rc.conf.d to BSD.root.mtree so it's created during
   installation;

2) Modify rc.subr so that if /etc/rc.conf.d/<service> is a directory,
   all of the files it contains are included.

Comments or objections?

DES
-- 
Dag-Erling Smørgrav - [email protected]

Index: etc/mtree/BSD.root.dist
===================================================================
--- etc/mtree/BSD.root.dist	(revision 269808)
+++ etc/mtree/BSD.root.dist	(working copy)
@@ -60,6 +60,8 @@
         ..
         ppp
         ..
+        rc.conf.d
+        ..
         rc.d
         ..
         security
Index: etc/rc.subr
===================================================================
--- etc/rc.subr	(revision 269808)
+++ etc/rc.subr	(working copy)
@@ -1290,8 +1290,14 @@
 		_rc_conf_loaded=true
 	fi
 	if [ -f /etc/rc.conf.d/"$_name" ]; then
-		debug "Sourcing /etc/rc.conf.d/${_name}"
+		debug "Sourcing /etc/rc.conf.d/$_name"
 		. /etc/rc.conf.d/"$_name"
+	elif [ -d /etc/rc.conf.d/"$_name" ] ; then
+		local _rc
+		for _rc in $(/bin/ls /etc/rc.conf.d/"$_name") ; do
+			debug "Sourcing /etc/rc.conf.d/$_name/$_rc"
+			. "/etc/rc.conf.d/$_name/$_rc"
+		done
 	fi
 
 	# Set defaults if defined.
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-rc
To unsubscribe, send any mail to "[email protected]"

Reply via email to