--- a/etc/periodic/weekly/340.noid 2022-05-12 03:45:23.000000000 -0500 +++ b/etc/periodic/weekly/340.noid 2023-08-12 15:21:27.867981000 -0500 @@ -26,23 +26,40 @@ . /etc/rc.subr load_rc_config jail - sep=: - OIFS="$IFS" - IFS="$sep" - for param in $(jail -f "$jail_conf" -e "$sep" 2>/dev/null) + if [ -r /etc/jail.conf ] + then + jail_confs="/etc/jail.conf" + fi + + if [ -d /etc/jail.conf.d ] + then + for file in /etc/jail.conf.d/*.conf + do + jail_confs="${jail_confs} ${file}" + done + fi + + for jc in ${jail_confs} do - case "$param" in - path=*) - _p=${param#path=} - if [ -z "$_p" -o "$_p" = / ]; then - continue - fi + sep=: + OIFS="$IFS" + IFS="$sep" - exclude="$exclude -path $_p -prune -or" - ;; - esac + for param in $(jail -f "${jc}" -e "$sep" 2>/dev/null) + do + case "$param" in + path=*) + _p=${param#path=} + if [ -z "$_p" -o "$_p" = / ]; then + continue + fi + + exclude="$exclude -path $_p -prune -or" + ;; + esac + done + IFS="$OIFS" done - IFS="$OIFS" fi rc=$(find -H ${weekly_noid_dirs:-/} \