From owner-dev-commits-src-all@freebsd.org Fri Jun 18 16:06:16 2021 Return-Path: Delivered-To: dev-commits-src-all@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 9CF58648B69; Fri, 18 Jun 2021 16:06:16 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G63gr3kz2z4tD9; Fri, 18 Jun 2021 16:06:16 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-io1-xd2f.google.com with SMTP id a6so7622241ioe.0; Fri, 18 Jun 2021 09:06:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:message-id:in-reply-to:references:subject :mime-version:content-transfer-encoding; bh=GQIk09R6dj22GX6+uPHxfLK9T5i2qLw7chdjNi3SON0=; b=Obdohgm3BfePFGBoI2W/jd37gjiCR9TUHELDohnIkYr2JxcjnzHK5UwRyf6bC8s1mZ GAhHfzOb6+CpayfPyOhbu+YwMbYfHDSuHlgmnyoFJFAViGJ0ZKiIU7TWIwLjJKqTrLBj ggDF9eGtXL5YQpLUkioznM4vFnkqvoUUZ13ztyNVVcBrJFReR9xOyXohhfgy8zt8NyzU f+cYT3z8XE7H/daCuj5/dEYCYpk/KE0+GG/sWM4EhvKmMCIs6s9R8H0CEZpfuc5u+bN4 T/YiCg5M6cGlbgf3ccFqMSdBlW/YLtNZPwzqdbCiPrPWSaAmxPEr8DpCiaxYxXk+/bgR DTDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:message-id:in-reply-to :references:subject:mime-version:content-transfer-encoding; bh=GQIk09R6dj22GX6+uPHxfLK9T5i2qLw7chdjNi3SON0=; b=IylLQnNQntMBio/FZ8JAkdkkNL1dm/nMVvGWD2kvbnIkoRjamlOGMU4h4CusrDg3RQ W11I9jricB7nppxMfQH0zav6vDO8/KXDy1i3UzS1MwoYijubTvFEqvDw0Pd10BCHC4Ph TNvi5iEzP82Ya7Pj5cwntCg4zRwBRRLpW8WoRXtAGMqPj3+ntWjE/cia3Krf9B+Gr/DT y6P34TaVz92PAa0AUQNF2HX5vi78SLtPi3xtAvTFjp8KN/b3iNJcSKAjWM3sSlqaVcp/ vZIR8yCwaJow6RT4hiLirmAQlXzPLc0q5htOoLB6LiHl6sTUvAK8hY654rBtFjBbRDil oAfQ== X-Gm-Message-State: AOAM531cVmnCjaribp3idUSj0oFDYh2AhkzDiyt0h7kQc6Nhok9uCMnk 2brwGDFSTZLDPQtlRXN8H+DDM6WqJVmhDQ== X-Google-Smtp-Source: ABdhPJxIelFi+7+xD/m04ADuXJlMi4XadR2EIkVKU4N4BmHex+L2Py35VyE+PA+/dH1/AE+EHtug7w== X-Received: by 2002:a05:6602:722:: with SMTP id g2mr8512110iox.118.1624032374861; Fri, 18 Jun 2021 09:06:14 -0700 (PDT) Received: from [127.0.0.1] (173-18-9-215.client.mchsi.com. [173.18.9.215]) by smtp.gmail.com with ESMTPSA id j8sm636911ilq.34.2021.06.18.09.06.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 18 Jun 2021 09:06:14 -0700 (PDT) Date: Fri, 18 Jun 2021 16:06:12 +0000 (UTC) From: Justin Hibbits To: Ceri Davies Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Message-ID: <75096289-7f26-4808-ae70-088dcc578c34@gmail.com> In-Reply-To: <202106181430.15IEUSel092505@gitrepo.freebsd.org> References: <202106181430.15IEUSel092505@gitrepo.freebsd.org> Subject: Re: git: c43b0081faab - main - devmatch: improve naming of devmatch config variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Correlation-ID: <75096289-7f26-4808-ae70-088dcc578c34@gmail.com> X-Rspamd-Queue-Id: 4G63gr3kz2z4tD9 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-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2021 16:06:16 -0000 Is there a reason, other than Wokification? Jun 18, 2021 09:30:33 Ceri Davies : > The branch main has been updated by ceri (doc committer): >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc43b0081faab742eb93c3d064b= 552b65f926b86e >=20 > commit c43b0081faab742eb93c3d064b552b65f926b86e > Author:=C2=A0=C2=A0=C2=A0=C2=A0 Ceri Davies > AuthorDate: 2021-06-18 12:17:30 +0000 > Commit:=C2=A0=C2=A0=C2=A0=C2=A0 Ceri Davies > CommitDate: 2021-06-18 12:17:30 +0000 >=20 > =C2=A0=C2=A0=C2=A0 devmatch: improve naming of devmatch config variable > =C2=A0=C2=A0=C2=A0 > =C2=A0=C2=A0=C2=A0 Accept the old rc.conf variable if the new one is not = present for > =C2=A0=C2=A0=C2=A0 compatability. > =C2=A0=C2=A0=C2=A0 > =C2=A0=C2=A0=C2=A0 Approved by:=C2=A0=C2=A0=C2=A0 imp > =C2=A0=C2=A0=C2=A0 Differential Revision:=C2=A0 https://reviews.freebsd.o= rg/D30806 > --- > libexec/rc/rc.conf=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +- > libexec/rc/rc.d/devmatch |=C2=A0 4 ++-- > share/man/man5/rc.conf.5 | 10 +++++++++- > 3 files changed, 12 insertions(+), 4 deletions(-) >=20 > 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=3D"/etc/ddb.conf"=C2=A0 # ddb(8) config file= . > devd_enable=3D"YES"=C2=A0 # Run devd, to trigger programs on device tree = changes. > devd_flags=3D""=C2=A0=C2=A0=C2=A0 # Additional flags for devd(8). > devmatch_enable=3D"YES"=C2=A0 # Demand load kernel modules based on devic= e ids. > -devmatch_blacklist=3D""=C2=A0 # List of modules (w/o .ko) to exclude fro= m devmatch. > +devmatch_blocklist=3D""=C2=A0 # List of modules (w/o .ko) to exclude fro= m devmatch. > #kld_list=3D""=C2=A0=C2=A0=C2=A0=C2=A0 # Kernel modules to load after loc= al disks are mounted > kldxref_enable=3D"YES" # Build linker.hints files with kldxref(8). > kldxref_clobber=3D"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() > =C2=A0 # or drivers that have symbolic links that > =C2=A0 # confuse devmatch by running it -n. > =C2=A0 # Finally, we filter out all items in the > - # devmactch_blacklist. > + # devmatch_blocklist. > =C2=A0 devctl freeze > - x=3D$(echo ${devmatch_blacklist} | tr ' ' '#') > + x=3D$(echo ${devmatch_blocklist:-${devmatch_blacklist}} | tr ' ' '#') > =C2=A0 for m in ${list}; do > =C2=A0=C2=A0=C2=A0 case "#${x}#" in > =C2=A0=C2=A0=C2=A0 *"#${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