aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2023-07-07 22:25:11 +0000
committerBrooks Davis <brooks@FreeBSD.org>2023-07-07 22:25:11 +0000
commitf55ef85748e48f5d70c3dbff7af1567076c79a1e (patch)
tree75543b1c15891ff463895e33c86235e3d6b96c86
parent3541d90836c0dde9734ea776f2b2b6c4ed8fd7f4 (diff)
downloadsrc-f55ef85748e48f5d70c3dbff7af1567076c79a1e.tar.gz
src-f55ef85748e48f5d70c3dbff7af1567076c79a1e.zip
etc/rc.d/routing: use find_system_scripts
In 3693d9140e05aba9942232df13468f51a6cde136 /etc/rc switched to using find_system_scripts rather than directly including /etc/rc.d/* in the list of scripts to run in order to skip .pkgsave files. Follow suit in etc/rc.d/routing. Sponsored by: DARPA
-rwxr-xr-xlibexec/rc/rc.d/routing3
1 files changed, 2 insertions, 1 deletions
diff --git a/libexec/rc/rc.d/routing b/libexec/rc/rc.d/routing
index 2f6500938e6a..6faddd553ddd 100755
--- a/libexec/rc/rc.d/routing
+++ b/libexec/rc/rc.d/routing
@@ -336,8 +336,9 @@ _check_dynamicrouting()
skip="$skip -s nojail"
fi
[ -n "$local_startup" ] && find_local_scripts_new
+ [ -n "$system_rc" ] && find_system_scripts
- for file in $( rcorder ${skip} /etc/rc.d/* ${local_rc} 2>/dev/null |
+ for file in $( rcorder ${skip} ${system_rc} ${local_rc} 2>/dev/null |
xargs grep -lE '^# PROVIDE:.*\<dynamicrouting\>' ); do
(set -- enabled; . $file) && return 0;
done