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

diff --git a/etc/rc.subr b/etc/rc.subr
index 7b1e38737c104218cc7c213d438d5699daa60a01..914d17f87a839363a93366cfd85ddbc64d30fa60 100644 (file)
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -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"