Date: Fri, 18 Jun 2021 16:06:12 +0000 (UTC) From: Justin Hibbits <chmeeedalf@gmail.com> To: Ceri Davies <ceri@FreeBSD.org> Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: c43b0081faab - main - devmatch: improve naming of devmatch config variable Message-ID: <75096289-7f26-4808-ae70-088dcc578c34@gmail.com> In-Reply-To: <202106181430.15IEUSel092505@gitrepo.freebsd.org> References: <202106181430.15IEUSel092505@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Is there a reason, other than Wokification? Jun 18, 2021 09:30:33 Ceri Davies <ceri@FreeBSD.org>: > 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 <ceri@FreeBSD.org> > AuthorDate: 2021-06-18 12:17:30 +0000 > Commit:=C2=A0=C2=A0=C2=A0=C2=A0 Ceri Davies <ceri@FreeBSD.org> > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?75096289-7f26-4808-ae70-088dcc578c34>