git: c43b0081faab - main - devmatch: improve naming of devmatch config variable

[Justin Hibbits]

Is there a reason, other than Wokification?

Jun 18, 2021 09:30:33 Ceri Davies <ceri at FreeBSD.org>:

> The branch main has been updated by ceri (doc committer):
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=c43b0081faab742eb93c3d064b552b65f926b86e
> 
> commit c43b0081faab742eb93c3d064b552b65f926b86e
> Author:     Ceri Davies <ceri at FreeBSD.org>
> AuthorDate: 2021-06-18 12:17:30 +0000
> Commit:     Ceri Davies <ceri at FreeBSD.org>
> CommitDate: 2021-06-18 12:17:30 +0000
> 
>     devmatch: improve naming of devmatch config variable
>    
>     Accept the old rc.conf variable if the new one is not present for
>     compatability.
>    
>     Approved by:    imp
>     Differential Revision:  https://reviews.freebsd.org/D30806
> ---
> libexec/rc/rc.conf       |  2 +-
> libexec/rc/rc.d/devmatch |  4 ++--
> share/man/man5/rc.conf.5 | 10 +++++++++-
> 3 files changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf
> index 041d4b6b5321..9fdc4d9d8636 100644
> --- a/libexec/rc/rc.conf
> +++ b/libexec/rc/rc.conf
> @@ -45,7 +45,7 @@ ddb_config="/etc/ddb.conf"  # ddb(8) config file.
> 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
> index 491bc94c4a16..0b2e3719dabb 100755
> --- a/libexec/rc/rc.d/devmatch
> +++ b/libexec/rc/rc.d/devmatch
> @@ -59,9 +59,9 @@ devmatch_start()
>   # 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
> index 95fa8bce4dc0..bf9289f30417 100644
> --- 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 @@ If set to
> .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