Merge ^/head r307383 through r307735.

4 files changed, 119 insertions, 43 deletions

diff --git a/etc/devd.conf b/etc/devd.conf
index e7654e45ad25..e4bd915d6ab3 100644
--- a/etc/devd.conf
+++ b/etc/devd.conf
@@ -24,7 +24,7 @@ options {
 		[0-9]+";
 	set wifi-driver-regex
 		"(ath|bwi|bwn|ipw|iwi|iwm|iwn|malo|mwl|ral|rsu|rum|run|uath|\
-		upgt|ural|urtw|urtwn|wi|wpi|wtap|zyd)[0-9]+";
+		upgt|ural|urtw|rtwn_usb|wi|wpi|wtap|zyd)[0-9]+";
 };
 
 # Note that the attach/detach with the highest value wins, so that one can
diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf
index 45e28feb7826..3d8858b95d7a 100644
--- a/etc/devd/usb.conf
+++ b/etc/devd/usb.conf
@@ -185,6 +185,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0409";
+	match "product" "0x0408";
+	action "kldload -n if_rtwn_usb";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0409";
 	match "product" "(0x8024|0x8025)";
 	action "kldload -n uipaq";
 };
@@ -304,6 +312,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0411";
+	match "product" "(0x0242|0x025d)";
+	action "kldload -n if_rtwn_usb";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0413";
 	match "product" "0x2101";
 	action "kldload -n uplcom";
@@ -553,6 +569,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04bb";
+	match "product" "0x0952";
+	action "kldload -n if_rtwn_usb";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04bb";
 	match "product" "(0x0a03|0x0a0e)";
 	action "kldload -n uplcom";
 };
@@ -682,7 +706,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x04f2";
 	match "product" "(0xaff7|0xaff8|0xaff9|0xaffa|0xaffa)";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -754,7 +778,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "0x1102";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -778,7 +802,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x050d";
 	match "product" "(0x2102|0x2103)";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -1050,7 +1074,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x056e";
 	match "product" "0x4008";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -1146,7 +1170,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x0586";
 	match "product" "0x341f";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -1160,6 +1184,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0586";
+	match "product" "0x3426";
+	action "kldload -n if_rtwn_usb";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x058f";
 	match "product" "0x9720";
 	action "kldload -n uplcom";
@@ -1442,7 +1474,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x06f8";
 	match "product" "0xe033";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -1658,7 +1690,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x07aa";
 	match "product" "0x0056";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -1722,7 +1754,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x07b8";
 	match "product" "(0x8178|0x8179|0x8188|0x8189)";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -2026,7 +2058,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x0846";
 	match "product" "0x9021";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -2041,8 +2073,8 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0846";
-	match "product" "0x9041";
-	action "kldload -n if_urtwn";
+	match "product" "(0x9041|0x9052)";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -2498,7 +2530,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "0x17ab";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -2522,7 +2554,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x0b05";
 	match "product" "0x17ba";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -2537,6 +2569,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
+	match "product" "0x17d2";
+	action "kldload -n if_rtwn_usb";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0b05";
 	match "product" "(0x4200|0x4201|0x4202|0x420f|0x9200|0x9202)";
 	action "kldload -n uipaq";
 };
@@ -2658,7 +2698,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "(0x0179|0x018a|0x317f)";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -2682,7 +2722,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "0x8170";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -2698,7 +2738,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "(0x8176|0x8177|0x8178|0x8179|0x817a|0x817b|0x817c|0x817d|0x817e|0x817f)";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -2714,7 +2754,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "(0x818a|0x8191)";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -2738,7 +2778,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x0bda";
 	match "product" "0x8754";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -3162,7 +3202,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "0x0052";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -3178,7 +3218,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x0df6";
 	match "product" "(0x005c|0x0061)";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -3193,6 +3233,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0df6";
+	match "product" "0x0074";
+	action "kldload -n if_rtwn_usb";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0df6";
 	match "product" "0x061c";
 	action "kldload -n if_axe";
 };
@@ -3257,8 +3305,8 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0e66";
-	match "product" "0x0019";
-	action "kldload -n if_urtwn";
+	match "product" "(0x0019|0x0023)";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -3330,7 +3378,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x0eb0";
 	match "product" "0x9071";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -3490,7 +3538,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x103c";
 	match "product" "0x1629";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -3976,6 +4024,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x13b1";
+	match "product" "0x003f";
+	action "kldload -n if_rtwn_usb";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x13d2";
 	match "product" "0x0400";
 	action "kldload -n if_kue";
@@ -4018,7 +4074,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x13d3";
 	match "product" "(0x3357|0x3358|0x3359)";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -4569,6 +4625,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1740";
+	match "product" "0x0100";
+	action "kldload -n if_rtwn_usb";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x1740";
 	match "product" "(0x0605|0x0615)";
 	action "kldload -n if_run";
 };
@@ -4961,8 +5025,8 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
-	match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d|0x330f|0x3310)";
-	action "kldload -n if_urtwn";
+	match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d|0x330f|0x3310|0x3314|0x3315|0x3316|0x3318)";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -5042,7 +5106,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x2019";
 	match "product" "(0x1201|0x4902)";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -5089,8 +5153,8 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
-	match "product" "(0xab2a|0xab2b|0xab2e)";
-	action "kldload -n if_urtwn";
+	match "product" "(0xab2a|0xab2b|0xab2e|0xab30)";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -5130,7 +5194,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x2019";
 	match "product" "0xed17";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -5170,7 +5234,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x20f4";
 	match "product" "0x624d";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -5185,8 +5249,8 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x20f4";
-	match "product" "0x648b";
-	action "kldload -n if_urtwn";
+	match "product" "(0x648b|0x805b)";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -5232,6 +5296,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x2357";
+	match "product" "0x0101";
+	action "kldload -n if_rtwn_usb";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x2405";
 	match "product" "0x0003";
 	action "kldload -n uslcom";
@@ -5354,7 +5426,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x4855";
 	match "product" "(0x0090|0x0091)";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -5465,8 +5537,8 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x7392";
-	match "product" "(0x7811|0x7822)";
-	action "kldload -n if_urtwn";
+	match "product" "(0x7811|0x7822|0xa811|0xa812|0xa822)";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -5522,7 +5594,7 @@ nomatch 32 {
 	match "mode" "host";
 	match "vendor" "0x9846";
 	match "product" "0x9041";
-	action "kldload -n if_urtwn";
+	action "kldload -n if_rtwn_usb";
 };
 
 nomatch 32 {
@@ -5817,5 +5889,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2722 USB entries processed
+# 2743 USB entries processed
 
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index bb8d849d4836..ea5791af17f5 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -396,6 +396,10 @@
         ..
         file
         ..
+        fs
+            tmpfs
+            ..
+        ..
         geom
             class
                 concat
diff --git a/etc/rc b/etc/rc
index 576ddf937af4..278c9de494c3 100644
--- a/etc/rc
+++ b/etc/rc
@@ -135,16 +135,16 @@ done
 # Note: this assumes firstboot_sentinel is on / when we have
 # a read-only /, or that it is on media that's writable.
 if [ -e ${firstboot_sentinel} ]; then
-	[ ${root_rw_mount} = "yes" ] || mount -uw /
+	[ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -uw /
 	chflags -R 0 ${firstboot_sentinel}
 	rm -rf ${firstboot_sentinel}
 	if [ -e ${firstboot_sentinel}-reboot ]; then
 		chflags -R 0 ${firstboot_sentinel}-reboot
 		rm -rf ${firstboot_sentinel}-reboot
-		[ ${root_rw_mount} = "yes" ] || mount -ur /
+		[ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur /
 		kill -INT 1
 	fi
-	[ ${root_rw_mount} = "yes" ] || mount -ur /
+	[ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur /
 fi
 
 echo ''