diff --git a/rc.subr b/rc.subr index 93dc4ba..5340541 100644 --- a/rc.subr +++ b/rc.subr @@ -608,11 +608,17 @@ _compute_ula_prefix() load_isp_hints() { - for _hint in $(ls ${rc_router_dir}/hints/*) + _hints="$( find ${rc_router_dir}/hints/ -type f )" + if [ -d "${rc_router_conf_dir}/hints/" ] + then + _hints="${_hints} $( find ${rc_router_conf_dir}/hints/ -type f )" + fi + + for _hint in $(ls ${_hints}) do v4_setup="dhcp" # v4 usually defaults to DHCP _isp=$( basename ${_hint} ) - . ${rc_router_dir}/hints/${_isp} + . ${_hint} eval rc_router_v4_isp_config_${_isp}=${v4_setup} eval prefix_len_${_isp}=${v6_prefix_len}