From owner-dev-commits-src-main@freebsd.org Fri Jun 18 14:30:29 2021 Return-Path: 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 1C55364633C; Fri, 18 Jun 2021 14:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G61YK0C4Rz4hDy; Fri, 18 Jun 2021 14:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E351224687; Fri, 18 Jun 2021 14:30:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15IEUSED092506; Fri, 18 Jun 2021 14:30:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15IEUSel092505; Fri, 18 Jun 2021 14:30:28 GMT (envelope-from git) Date: Fri, 18 Jun 2021 14:30:28 GMT Message-Id: <202106181430.15IEUSel092505@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ceri Davies Subject: git: c43b0081faab - main - devmatch: improve naming of devmatch config variable MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ceri X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c43b0081faab742eb93c3d064b552b65f926b86e Auto-Submitted: auto-generated 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2021 14:30:29 -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 AuthorDate: 2021-06-18 12:17:30 +0000 Commit: Ceri Davies 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