git: f55ef85748e4 - main - etc/rc.d/routing: use find_system_scripts
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 07 Jul 2023 22:26:02 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=f55ef85748e48f5d70c3dbff7af1567076c79a1e
commit f55ef85748e48f5d70c3dbff7af1567076c79a1e
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-07-07 22:25:11 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-07-07 22:25:11 +0000
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
---
libexec/rc/rc.d/routing | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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