diff options
| author | des <des@FreeBSD.org> | 2014-09-08 11:18:27 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2014-09-08 11:18:27 +0000 |
| commit | 1b9496716d6c8b542db3304a742378cddb1b7c48 (patch) | |
| tree | a4019845a23157ffba69aa8a414afdc66a7c0ec6 /etc/rc.subr | |
| parent | 220594599565b8c04c14a4e89f5a165cc062548e (diff) | |
| download | FreeBSD-src-1b9496716d6c8b542db3304a742378cddb1b7c48.zip FreeBSD-src-1b9496716d6c8b542db3304a742378cddb1b7c48.tar.gz | |
MFH (r270392, r270676, r270679, r270698): add support for subdirectories in rc.conf.d
Approved by: re (glebius)
Diffstat (limited to 'etc/rc.subr')
| -rw-r--r-- | etc/rc.subr | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/etc/rc.subr b/etc/rc.subr index b6172db..ff4e898 100644 --- a/etc/rc.subr +++ b/etc/rc.subr @@ -1270,7 +1270,7 @@ run_rc_script() # load_rc_config() { - local _name _rcvar_val _var _defval _v _msg _new + local _name _rcvar_val _var _defval _v _msg _new _d _name=$1 if [ -z "$_name" ]; then err 3 'USAGE: load_rc_config name' @@ -1289,10 +1289,21 @@ load_rc_config() fi _rc_conf_loaded=true fi - if [ -f /etc/rc.conf.d/"$_name" ]; then - debug "Sourcing /etc/rc.conf.d/${_name}" - . /etc/rc.conf.d/"$_name" - fi + + for _d in /etc ${local_startup%*/rc.d}; do + if [ -f ${_d}/rc.conf.d/"$_name" ]; then + debug "Sourcing ${_d}/rc.conf.d/$_name" + . ${_d}/rc.conf.d/"$_name" + elif [ -d ${_d}/rc.conf.d/"$_name" ] ; then + local _rc + for _rc in ${_d}/rc.conf.d/"$_name"/* ; do + if [ -f "$_rc" ] ; then + debug "Sourcing $_rc" + . "$_rc" + fi + done + fi + done # Set defaults if defined. for _var in $rcvar; do |
