svn commit: r270676 - head/etc

[Hiroki Sato]

Baptiste Daroussin <bapt at FreeBSD.org> wrote
  in <201408262233.s7QMXYfd056791 at svn.freebsd.org>:

ba> Author: bapt
ba> Date: Tue Aug 26 22:33:34 2014
ba> New Revision: 270676
ba> URL: http://svnweb.freebsd.org/changeset/base/270676
ba>
ba> Log:
ba>   Allow to configure services from ${LOCALBASE}/etc/rc.conf.d
ba>
ba>   Reviewed by:	bdrewery
ba>   MFC after:	1 week
ba>   Relnotes:	yes
ba>
ba> Modified:
ba>   head/etc/rc.subr
ba>
ba> Modified: head/etc/rc.subr
ba> ==============================================================================
ba> --- head/etc/rc.subr	Tue Aug 26 22:20:02 2014	(r270675)
ba> +++ head/etc/rc.subr	Tue Aug 26 22:33:34 2014	(r270676)
ba> @@ -1301,6 +1301,10 @@ load_rc_config()
ba>  			fi
ba>  		done
ba>  	fi
ba> +	if [ -f ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name" ]; then
ba> +		debug "Sourcing ${LOCALBASE:-/usr/local}/etc/rc.conf.d/${_name}"
ba> +		. ${LOCALBASE:-/usr/local}/etc/rc.conf.d/"$_name"
ba> +	fi

 This should hornor ${local_startup} instead of ${LOCALBASE} since it
 is not used in rc(8), and should be compatible with DES's commit in
 r270392.

 How about the attached patch?

-- Hiroki
-------------- next part --------------
A non-text attachment was scrubbed...
Name: rc.subr.20140827-1.diff
Type: text/x-patch
Size: 1399 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20140827/108128fa/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20140827/108128fa/attachment.sig>