Re: svn commit: r329126 - head/etc/devd

2018-02-12 Thread Andriy Gapon
On 12/02/2018 09:14, Bruce Evans wrote:
> No, it is just another defense against people breaking separate /usr.

/usr is too diverse.
Separate (from root and from each other) /usr/local, /usr/obj, /usr/ports,
/usr/src, /usr/home are a good idea.
Separate /usr/bin and /usr/sbin ... many potential problems for zero benefit.
Legacy storage allocation schemes are very limiting, of course.

-- 
Andriy Gapon
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r329126 - head/etc/devd

2018-02-11 Thread Bruce Evans

On Sun, 11 Feb 2018, Warner Losh wrote:


On Feb 11, 2018 7:05 PM, "Conrad Meyer"  wrote:

On Sun, Feb 11, 2018 at 3:46 PM, Rodney W. Grimes
 wrote:

Moving this to /usr creates a cyclic issue in that you then need
/usr to be mounted before devd can start and devd's /etc/rc.d file
says:
# PROVIDE: devd
# REQUIRE: NETWORKING
# BEFORE: mountcritremote
# KEYWORD: nojail

In the diskless and nfs shared /usr worlds devd wants to start
before /usr is mounted.


If devd is needed to mount /usr (???), it seems like just another
demonstration of why separate /usr is a poor idea.


No, it is just another defense against people breaking separate /usr.


No, it's another reason why generated devd files are wrong in the face of
devmatch.


Bruce
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r329126 - head/etc/devd

2018-02-11 Thread Allan Jude
On 2018-02-11 18:46, Rodney W. Grimes wrote:
> [ Charset ISO-8859-1 unsupported, converting... ]
>> On Sun, 2018-02-11 at 10:20 -0800, Conrad Meyer wrote:
>>> On Sun, Feb 11, 2018 at 8:35 AM, Ian Lepore  wrote:

 Author: ian
 Date: Sun Feb 11 16:35:56 2018
 New Revision: 329126
 URL: https://svnweb.freebsd.org/changeset/base/329126

 Log:
 ? Regenerate devd/usb.conf after the recent addition of several new
 device IDs.

 Modified:
 ? head/etc/devd/usb.conf
>>>
>>> If this file is machine generated and not an administrator
>>> configuration file, shouldn't it live in /usr/share instead of /etc,
>>> per hier(7)?
>>>
>>> Best,
>>> Conrad
>>>
>>
>> I wonder if that question would apply to all five files we put in
>> /etc/devd? ?It looks like they could be moved to /usr/share with
>> minimal fuss by adding that directory to the search list in
>> /etc/devd.conf.
> 
> Moving this to /usr creates a cyclic issue in that you then need
> /usr to be mounted before devd can start and devd's /etc/rc.d file
> says:
> # PROVIDE: devd
> # REQUIRE: NETWORKING
> # BEFORE: mountcritremote
> # KEYWORD: nojail
> 
> In the diskless and nfs shared /usr worlds devd wants to start
> before /usr is mounted.
> 
>> I'm agnostic about the value of moving them. ?Users can configure local
>> rules by modifying the existing devd.conf and files in devd/ and
>> dealing with mergemaster on updates, or by adding their own new files
>> in devd/.
> 

Maybe the correct place is /etc/defaults/devd/ then?

-- 
Allan Jude



signature.asc
Description: OpenPGP digital signature


Re: svn commit: r329126 - head/etc/devd

2018-02-11 Thread Conrad Meyer
As usual, I'll believe it when I see it.  If it's so easy, seems like
you could just commit it today.  And if it's not so easy, maybe the
integration isn't so trivial.

On Sun, Feb 11, 2018 at 8:27 PM, Warner Losh  wrote:
>
>
> On Sun, Feb 11, 2018 at 8:54 PM, Conrad Meyer  wrote:
>>
>> On Sun, Feb 11, 2018 at 6:58 PM, Warner Losh  wrote:
>> > No, it's another reason why generated devd files are wrong in the face
>> > of
>> > devmatch.
>>
>> Devmatch is both vaporware and orthogonal to the placement of
>> pre-devmatch static system databases.
>
>
> kldload $(devmatch | uniq) would do the trick.
>
> I take exception to the vaporware comment. At worst it's incompletely
> integrated. The point is that these generated things are at worst a
> transient thing that aren't worth moving or even arguing about where they
> should have gone were they not set for deletion soon.
>
> Warner
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r329126 - head/etc/devd

2018-02-11 Thread Warner Losh
OK. I guess I shouldn't push when angry to try to prove a point. That never
works out well...

So, I needed r329149 and 329150 as well to tweak a couple of things.

Warner



On Sun, Feb 11, 2018 at 9:45 PM, Warner Losh  wrote:

> Sigh. r329147, r329148.
>
> Trivial.
>
> Warner
>
>
> On Sun, Feb 11, 2018 at 9:41 PM, Conrad Meyer  wrote:
>
>> As usual, I'll believe it when I see it.  If it's so easy, seems like
>> you could just commit it today.  And if it's not so easy, maybe the
>> integration isn't so trivial.
>>
>> On Sun, Feb 11, 2018 at 8:27 PM, Warner Losh  wrote:
>> >
>> >
>> > On Sun, Feb 11, 2018 at 8:54 PM, Conrad Meyer  wrote:
>> >>
>> >> On Sun, Feb 11, 2018 at 6:58 PM, Warner Losh  wrote:
>> >> > No, it's another reason why generated devd files are wrong in the
>> face
>> >> > of
>> >> > devmatch.
>> >>
>> >> Devmatch is both vaporware and orthogonal to the placement of
>> >> pre-devmatch static system databases.
>> >
>> >
>> > kldload $(devmatch | uniq) would do the trick.
>> >
>> > I take exception to the vaporware comment. At worst it's incompletely
>> > integrated. The point is that these generated things are at worst a
>> > transient thing that aren't worth moving or even arguing about where
>> they
>> > should have gone were they not set for deletion soon.
>> >
>> > Warner
>>
>
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r329126 - head/etc/devd

2018-02-11 Thread Conrad Meyer
I am happy with this outcome, thanks.

On Sun, Feb 11, 2018 at 8:45 PM, Warner Losh  wrote:
> Sigh. r329147, r329148.
>
> Trivial.
>
> Warner
>
>
> On Sun, Feb 11, 2018 at 9:41 PM, Conrad Meyer  wrote:
>>
>> As usual, I'll believe it when I see it.  If it's so easy, seems like
>> you could just commit it today.  And if it's not so easy, maybe the
>> integration isn't so trivial.
>>
>> On Sun, Feb 11, 2018 at 8:27 PM, Warner Losh  wrote:
>> >
>> >
>> > On Sun, Feb 11, 2018 at 8:54 PM, Conrad Meyer  wrote:
>> >>
>> >> On Sun, Feb 11, 2018 at 6:58 PM, Warner Losh  wrote:
>> >> > No, it's another reason why generated devd files are wrong in the
>> >> > face
>> >> > of
>> >> > devmatch.
>> >>
>> >> Devmatch is both vaporware and orthogonal to the placement of
>> >> pre-devmatch static system databases.
>> >
>> >
>> > kldload $(devmatch | uniq) would do the trick.
>> >
>> > I take exception to the vaporware comment. At worst it's incompletely
>> > integrated. The point is that these generated things are at worst a
>> > transient thing that aren't worth moving or even arguing about where
>> > they
>> > should have gone were they not set for deletion soon.
>> >
>> > Warner
>
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r329126 - head/etc/devd

2018-02-11 Thread Warner Losh
Sigh. r329147, r329148.

Trivial.

Warner

On Sun, Feb 11, 2018 at 9:41 PM, Conrad Meyer  wrote:

> As usual, I'll believe it when I see it.  If it's so easy, seems like
> you could just commit it today.  And if it's not so easy, maybe the
> integration isn't so trivial.
>
> On Sun, Feb 11, 2018 at 8:27 PM, Warner Losh  wrote:
> >
> >
> > On Sun, Feb 11, 2018 at 8:54 PM, Conrad Meyer  wrote:
> >>
> >> On Sun, Feb 11, 2018 at 6:58 PM, Warner Losh  wrote:
> >> > No, it's another reason why generated devd files are wrong in the face
> >> > of
> >> > devmatch.
> >>
> >> Devmatch is both vaporware and orthogonal to the placement of
> >> pre-devmatch static system databases.
> >
> >
> > kldload $(devmatch | uniq) would do the trick.
> >
> > I take exception to the vaporware comment. At worst it's incompletely
> > integrated. The point is that these generated things are at worst a
> > transient thing that aren't worth moving or even arguing about where they
> > should have gone were they not set for deletion soon.
> >
> > Warner
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r329126 - head/etc/devd

2018-02-11 Thread Warner Losh
On Sun, Feb 11, 2018 at 8:54 PM, Conrad Meyer  wrote:

> On Sun, Feb 11, 2018 at 6:58 PM, Warner Losh  wrote:
> > No, it's another reason why generated devd files are wrong in the face of
> > devmatch.
>
> Devmatch is both vaporware and orthogonal to the placement of
> pre-devmatch static system databases.
>

kldload $(devmatch | uniq) would do the trick.

I take exception to the vaporware comment. At worst it's incompletely
integrated. The point is that these generated things are at worst a
transient thing that aren't worth moving or even arguing about where they
should have gone were they not set for deletion soon.

Warner
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r329126 - head/etc/devd

2018-02-11 Thread Conrad Meyer
On Sun, Feb 11, 2018 at 6:58 PM, Warner Losh  wrote:
> No, it's another reason why generated devd files are wrong in the face of
> devmatch.

Devmatch is both vaporware and orthogonal to the placement of
pre-devmatch static system databases.

I'm on board with the glorious devmatch-autoloads-usb-devices future.
But someone has to actually write the logic that incorporates it with
devd and remove these databases before it matters.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r329126 - head/etc/devd

2018-02-11 Thread Warner Losh
On Feb 11, 2018 7:05 PM, "Conrad Meyer"  wrote:

On Sun, Feb 11, 2018 at 3:46 PM, Rodney W. Grimes
 wrote:
> Moving this to /usr creates a cyclic issue in that you then need
> /usr to be mounted before devd can start and devd's /etc/rc.d file
> says:
> # PROVIDE: devd
> # REQUIRE: NETWORKING
> # BEFORE: mountcritremote
> # KEYWORD: nojail
>
> In the diskless and nfs shared /usr worlds devd wants to start
> before /usr is mounted.

If devd is needed to mount /usr (???), it seems like just another
demonstration of why separate /usr is a poor idea.


No, it's another reason why generated devd files are wrong in the face of
devmatch.

Warner
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r329126 - head/etc/devd

2018-02-11 Thread Conrad Meyer
On Sun, Feb 11, 2018 at 3:46 PM, Rodney W. Grimes
 wrote:
> Moving this to /usr creates a cyclic issue in that you then need
> /usr to be mounted before devd can start and devd's /etc/rc.d file
> says:
> # PROVIDE: devd
> # REQUIRE: NETWORKING
> # BEFORE: mountcritremote
> # KEYWORD: nojail
>
> In the diskless and nfs shared /usr worlds devd wants to start
> before /usr is mounted.

If devd is needed to mount /usr (???), it seems like just another
demonstration of why separate /usr is a poor idea.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r329126 - head/etc/devd

2018-02-11 Thread Rodney W. Grimes
[ Charset ISO-8859-1 unsupported, converting... ]
> On Sun, 2018-02-11 at 10:20 -0800, Conrad Meyer wrote:
> > On Sun, Feb 11, 2018 at 8:35 AM, Ian Lepore  wrote:
> > > 
> > > Author: ian
> > > Date: Sun Feb 11 16:35:56 2018
> > > New Revision: 329126
> > > URL: https://svnweb.freebsd.org/changeset/base/329126
> > > 
> > > Log:
> > > ? Regenerate devd/usb.conf after the recent addition of several new
> > > device IDs.
> > > 
> > > Modified:
> > > ? head/etc/devd/usb.conf
> > 
> > If this file is machine generated and not an administrator
> > configuration file, shouldn't it live in /usr/share instead of /etc,
> > per hier(7)?
> > 
> > Best,
> > Conrad
> > 
> 
> I wonder if that question would apply to all five files we put in
> /etc/devd? ?It looks like they could be moved to /usr/share with
> minimal fuss by adding that directory to the search list in
> /etc/devd.conf.

Moving this to /usr creates a cyclic issue in that you then need
/usr to be mounted before devd can start and devd's /etc/rc.d file
says:
# PROVIDE: devd
# REQUIRE: NETWORKING
# BEFORE: mountcritremote
# KEYWORD: nojail

In the diskless and nfs shared /usr worlds devd wants to start
before /usr is mounted.

> I'm agnostic about the value of moving them. ?Users can configure local
> rules by modifying the existing devd.conf and files in devd/ and
> dealing with mergemaster on updates, or by adding their own new files
> in devd/.

-- 
Rod Grimes rgri...@freebsd.org
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r329126 - head/etc/devd

2018-02-11 Thread Warner Losh
On Sun, Feb 11, 2018 at 11:42 AM, Ian Lepore  wrote:

> On Sun, 2018-02-11 at 10:20 -0800, Conrad Meyer wrote:
> > On Sun, Feb 11, 2018 at 8:35 AM, Ian Lepore  wrote:
> > >
> > > Author: ian
> > > Date: Sun Feb 11 16:35:56 2018
> > > New Revision: 329126
> > > URL: https://svnweb.freebsd.org/changeset/base/329126
> > >
> > > Log:
> > >   Regenerate devd/usb.conf after the recent addition of several new
> > > device IDs.
> > >
> > > Modified:
> > >   head/etc/devd/usb.conf
> >
> > If this file is machine generated and not an administrator
> > configuration file, shouldn't it live in /usr/share instead of /etc,
> > per hier(7)?
> >
> > Best,
> > Conrad
> >
>
> I wonder if that question would apply to all five files we put in
> /etc/devd?  It looks like they could be moved to /usr/share with
> minimal fuss by adding that directory to the search list in
> /etc/devd.conf.
>
> I'm agnostic about the value of moving them.  Users can configure local
> rules by modifying the existing devd.conf and files in devd/ and
> dealing with mergemaster on updates, or by adding their own new files
> in devd/.
>

It doesn't matter. We're better off throwing the generated stuff away
entirely and migrating this to devmatch.

Warner
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r329126 - head/etc/devd

2018-02-11 Thread Ian Lepore
On Sun, 2018-02-11 at 10:20 -0800, Conrad Meyer wrote:
> On Sun, Feb 11, 2018 at 8:35 AM, Ian Lepore  wrote:
> > 
> > Author: ian
> > Date: Sun Feb 11 16:35:56 2018
> > New Revision: 329126
> > URL: https://svnweb.freebsd.org/changeset/base/329126
> > 
> > Log:
> >   Regenerate devd/usb.conf after the recent addition of several new
> > device IDs.
> > 
> > Modified:
> >   head/etc/devd/usb.conf
> 
> If this file is machine generated and not an administrator
> configuration file, shouldn't it live in /usr/share instead of /etc,
> per hier(7)?
> 
> Best,
> Conrad
> 

I wonder if that question would apply to all five files we put in
/etc/devd?  It looks like they could be moved to /usr/share with
minimal fuss by adding that directory to the search list in
/etc/devd.conf.

I'm agnostic about the value of moving them.  Users can configure local
rules by modifying the existing devd.conf and files in devd/ and
dealing with mergemaster on updates, or by adding their own new files
in devd/.

-- Ian
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r329126 - head/etc/devd

2018-02-11 Thread Conrad Meyer
On Sun, Feb 11, 2018 at 8:35 AM, Ian Lepore  wrote:
> Author: ian
> Date: Sun Feb 11 16:35:56 2018
> New Revision: 329126
> URL: https://svnweb.freebsd.org/changeset/base/329126
>
> Log:
>   Regenerate devd/usb.conf after the recent addition of several new device 
> IDs.
>
> Modified:
>   head/etc/devd/usb.conf


If this file is machine generated and not an administrator
configuration file, shouldn't it live in /usr/share instead of /etc,
per hier(7)?

Best,
Conrad
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


svn commit: r329126 - head/etc/devd

2018-02-11 Thread Ian Lepore
Author: ian
Date: Sun Feb 11 16:35:56 2018
New Revision: 329126
URL: https://svnweb.freebsd.org/changeset/base/329126

Log:
  Regenerate devd/usb.conf after the recent addition of several new device IDs.

Modified:
  head/etc/devd/usb.conf

Modified: head/etc/devd/usb.conf
==
--- head/etc/devd/usb.conf  Sun Feb 11 16:35:23 2018(r329125)
+++ head/etc/devd/usb.conf  Sun Feb 11 16:35:56 2018(r329126)
@@ -145,7 +145,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0403";
-   match "product" 
"(0x5259|0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xa6d1|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed7
 
4|0xee18|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0x|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8)";
+   match "product" 
"(0x5259|0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x8a98|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xa6d1|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed7
 
3|0xed74|0xee18|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0x|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8)";
action "kldload -n uftdi";
 };
 
@@ -2793,7 +2793,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0bda";
-   match "product" "0x8754";
+   match "product" "(0x8754|0x8812)";
action "kldload -n if_rtwn_usb";
 };
 
@@ -3681,7 +3681,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x10c4";
-   match "product" 
"(0x8066|0x806f|0x807a|0x80c4|0x80ca|0x80dd|0x80ed|0x80f6|0x8115|0x813d|0x813f|0x814a|0x814a|0x814b|0x8156|0x815e|0x815f|0x818b|0x819f|0x81a6|0x81a9|0x81ac|0x81ad|0x81c8|0x81e2|0x81e7|0x81e8|0x81f2|0x8218|0x822b|0x826b|0x8293|0x82f9|0x8341|0x8382|0x83a8|0x83d8|0x8411|0x8418|0x846e|0x8477|0x85ea|0x85eb|0x85f8|0x8664|0x8665|0x88a4|0x88a5|0xea60|0xea61|0xea70|0xea71|0xea80|0xf001|0xf002|0xf003|0xf004)";
+   match "product"