svn commit: r286163 - head/etc

Jilles Tjoelker jilles at FreeBSD.org
Sat Aug 1 22:00:26 UTC 2015


Author: jilles
Date: Sat Aug  1 22:00:25 2015
New Revision: 286163
URL: https://svnweb.freebsd.org/changeset/base/286163

Log:
  rc.subr: Allow rc.conf.d with multi-directory local_startup.
  
  I also changed ${...%*/rc.d} to ${...%/rc.d} since the shortest match always
  has an empty string for the asterisk.
  
  PR:		201641
  Submitted by:	Jamie Landeg-Jones (original version)
  MFC after:	1 week

Modified:
  head/etc/rc.subr

Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr	Sat Aug  1 20:40:37 2015	(r286162)
+++ head/etc/rc.subr	Sat Aug  1 22:00:25 2015	(r286163)
@@ -1333,7 +1333,8 @@ load_rc_config()
 	# If a service name was specified, attempt to load
 	# service-specific configuration
 	if [ -n "$_name" ] ; then
-		for _d in /etc ${local_startup%*/rc.d}; do
+		for _d in /etc ${local_startup}; do
+			_d=${_d%/rc.d}
 			if [ -f ${_d}/rc.conf.d/"$_name" ]; then
 				debug "Sourcing ${_d}/rc.conf.d/$_name"
 				. ${_d}/rc.conf.d/"$_name"


More information about the svn-src-head mailing list