diff options
| author | Warner Losh <imp@FreeBSD.org> | 2021-11-21 15:50:51 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2021-11-21 15:54:45 +0000 |
| commit | a8935083b5181b0a56d26cad7191ef138228befd (patch) | |
| tree | 8c6535ae51cdeaea41ddb56a82330694955ab56a /libexec | |
| parent | a8837c77efd0bb9d934657edf87a9a66baac7479 (diff) | |
| download | src-a8935083b5181b0a56d26cad7191ef138228befd.tar.gz src-a8935083b5181b0a56d26cad7191ef138228befd.zip | |
devmatch: Allow devmatch_blocklist to be set in kenv too
Add in all the variables set in the kenv variable devmatch_blocklist
too. This allows blocking autoloading from the boot loader.
Sponsored by: Netflix
Reviewed by: 0mp
Differential Revision: https://reviews.freebsd.org/D32171
Diffstat (limited to 'libexec')
| -rwxr-xr-x | libexec/rc/rc.d/devmatch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libexec/rc/rc.d/devmatch b/libexec/rc/rc.d/devmatch index f5b8e8e51071..f7925321eebe 100755 --- a/libexec/rc/rc.d/devmatch +++ b/libexec/rc/rc.d/devmatch @@ -64,7 +64,7 @@ devmatch_start() # names with .ko devctl freeze - x=$(echo '#'${devmatch_blocklist:-${devmatch_blacklist}}'#' | \ + x=$(echo "#${devmatch_blocklist:-${devmatch_blacklist}}#$(kenv -q devmatch_blocklist)#" | \ sed -e "s/ /#/g;s/\.ko#/#/g") for m in ${list}; do m="${m%.ko}" |