D32171.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D32171.diff
View Options

	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
	@@ -64,7 +64,7 @@
	# 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}"
	diff --git a/sbin/devmatch/devmatch.8 b/sbin/devmatch/devmatch.8
	--- a/sbin/devmatch/devmatch.8
	+++ b/sbin/devmatch/devmatch.8
	@@ -23,7 +23,7 @@
	.\"
	.\" $FreeBSD$
	.\"
	-.Dd October 12, 2020
	+.Dd November 21, 2021
	.Dt DEVMATCH 8
	.Os
	.Sh NAME
	@@ -67,6 +67,7 @@
	Produce more verbose output.
	.El
	.Sh SEE ALSO
	+.Xr rc.conf 5 ,
	.Xr devinfo 8 ,
	.Xr MODULE_PNP_INFO 9
	.Sh HISTORY
	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 November 18, 2021
	+.Dd November 21, 2021
	.Dt RC.CONF 5
	.Os
	.Sh NAME
	@@ -261,6 +261,12 @@
	.Pq Vt str
	A whitespace-separated list of kernel modules to be ignored by
	.Xr devmatch 8 .
	+In addition, the
	+.Xr kenv 1
	+.Va devmatch_blocklist
	+is appended to this variable to allow disabling of
	+.Xr devmatch 8
	+loaded modules from the boot loader.
	.It Va devmatch_blacklist
	.Pq Vt str
	This variable is deprecated.