Page MenuHomeFreeBSD
Files F108600385

D30806.diff
No OneTemporary
Actions

D30806.diff
View Options

diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf
--- a/libexec/rc/rc.conf
+++ b/libexec/rc/rc.conf
@@ -45,7 +45,7 @@
devd_enable="YES" # Run devd, to trigger programs on device tree changes.
devd_flags="" # Additional flags for devd(8).
devmatch_enable="YES" # Demand load kernel modules based on device ids.
-devmatch_blacklist="" # List of modules (w/o .ko) to exclude from devmatch.
+devmatch_blocklist="" # List of modules (w/o .ko) to exclude from devmatch.
#kld_list="" # Kernel modules to load after local disks are mounted
kldxref_enable="YES" # Build linker.hints files with kldxref(8).
kldxref_clobber="NO" # Overwrite old linker.hints at boot.
diff --git a/libexec/rc/rc.d/devmatch b/libexec/rc/rc.d/devmatch
--- a/libexec/rc/rc.d/devmatch
+++ b/libexec/rc/rc.d/devmatch
@@ -59,9 +59,9 @@
# or drivers that have symbolic links that
# confuse devmatch by running it -n.
# Finally, we filter out all items in the
- # devmactch_blacklist.
+ # devmatch_blocklist.
devctl freeze
- x=$(echo ${devmatch_blacklist} | tr ' ' '#')
+ x=$(echo ${devmatch_blocklist:-${devmatch_blacklist}} | tr ' ' '#')
for m in ${list}; do
case "#${x}#" in
*"#${m}#"*) continue ;;
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 13, 2021
+.Dd June 18, 2021
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -257,8 +257,16 @@
.Dq Li NO ,
disable auto-loading of kernel modules with
.Xr devmatch 8 .
+.It Va devmatch_blocklist
+.Pq Vt str
+A whitespace-separated list of kernel modules to be ignored by
+.Xr devmatch 8 .
.It Va devmatch_blacklist
.Pq Vt str
+This variable is deprecated.
+Use
+.Va devmatch_blocklist
+instead.
A whitespace-separated list of kernel modules to be ignored by
.Xr devmatch 8 .
.It Va kld_list

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 27, 7:25 PM (7 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16206858
Default Alt Text
D30806.diff (1 KB)

Event Timeline