conf/141909: add rc.conf.d support to /usr/local

[Jason Helfman]

>Number:         141909
>Category:       conf
>Synopsis:       add rc.conf.d support to /usr/local
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 23 01:10:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Jason Helfman
>Release:        7.2-RELEASE-p4
>Organization:
Experts Exchange
>Environment:
7.2-RELEASE-p4 FreeBSD 7.2-RELEASE-p4 #0: Fri Oct  2 12:21:39 UTC 2009     root at i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
rc.conf.d is not supported under the /usr/local subsystem
>How-To-Repeat:
mkdir -p /usr/local/etc/rc.conf.d/
touch /usr/local/etc/rc.conf.d/sshd
echo enable_sshd=\"YES\" > /usr/local/etc/rc.conf.d/sshd
remove sshd service from /etc/rc.conf or /etc/rc.conf.d/

/etc/rc.d/sshd rcvar --> should show NO
>Fix:
Added patch.

Patch attached with submission follows:

--- src/etc/rc.subr.orig	2009-12-22 16:50:51.000000000 -0800
+++ src/etc/rc.subr	2009-12-22 16:52:46.000000000 -0800
@@ -927,6 +927,11 @@
 		debug "Sourcing /etc/rc.conf.d/${_name}"
 		. /etc/rc.conf.d/"$_name"
 	fi
+
+	if [ -f /usr/local/etc/rc.conf.d/"$_name" ]; then
+		debug "Sourcing /usr/local/etc/rc.conf.d/${_name}"
+		. /usr/local/etc/rc.conf.d/"$_name"
+	fi
 }
   
 #


>Release-Note:
>Audit-Trail:
>Unformatted: