From owner-dev-commits-src-main@freebsd.org Fri Jun 18 15:26:02 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id D388C648058;
Fri, 18 Jun 2021 15:26:02 +0000 (UTC)
(envelope-from freebsd@gndrsh.dnsmgr.net)
Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4G62nQ3q8bz4m70;
Fri, 18 Jun 2021 15:26:02 +0000 (UTC)
(envelope-from freebsd@gndrsh.dnsmgr.net)
Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1])
by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 15IFPr5a055289;
Fri, 18 Jun 2021 08:25:53 -0700 (PDT)
(envelope-from freebsd@gndrsh.dnsmgr.net)
Received: (from freebsd@localhost)
by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 15IFPrtI055288;
Fri, 18 Jun 2021 08:25:53 -0700 (PDT) (envelope-from freebsd)
From: "Rodney W. Grimes" <freebsd@gndrsh.dnsmgr.net>
Message-Id: <202106181525.15IFPrtI055288@gndrsh.dnsmgr.net>
Subject: Re: git: c43b0081faab - main - devmatch: improve naming of devmatch
config variable
In-Reply-To: <202106181430.15IEUSel092505@gitrepo.freebsd.org>
To: Ceri Davies <ceri@freebsd.org>
Date: Fri, 18 Jun 2021 08:25:53 -0700 (PDT)
CC: src-committers@freebsd.org, dev-commits-src-all@freebsd.org,
dev-commits-src-main@freebsd.org
Reply-To: rgrimes@freebsd.org
X-Mailer: ELM [version 2.4ME+ PL121h (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
X-Rspamd-Queue-Id: 4G62nQ3q8bz4m70
X-Spamd-Bar: ----
Authentication-Results: mx1.freebsd.org;
none
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[]
X-BeenThere: dev-commits-src-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for the main branch of the src repository
<dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Jun 2021 15:26:02 -0000
> 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@FreeBSD.org>
> AuthorDate: 2021-06-18 12:17:30 +0000
> Commit: Ceri Davies <ceri@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
^^^^^^^^^
So though this tries to use the canned "you can just change black to block"
it fails to consider that this isnt a block list, it is an ignore list,
please consider using ignore here and/or in future similiar cases.
> +.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
>
--
Rod Grimes rgrimes@freebsd.org