sync from head

14 files changed, 278 insertions, 157 deletions

diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index 00ce157..e630e1d 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -95,13 +95,13 @@ daily_news_expire_enable="YES"				# Run news.expire
 daily_status_disks_enable="YES"				# Check disk status
 daily_status_disks_df_flags="-l -h"		# df(1) flags for check
 
+# 401.status-graid
+daily_status_graid_enable="NO"				# Check graid(8)
+
 # 404.status-zfs
 daily_status_zfs_enable="NO"				# Check ZFS
 daily_status_zfs_zpool_list_enable="YES"		# List ZFS pools
 
-# 405.status-ata_raid
-daily_status_ata_raid_enable="NO"			# Check ATA raid status
-
 # 406.status-gmirror
 daily_status_gmirror_enable="NO"			# Check gmirror(8)
 
diff --git a/etc/devd.conf b/etc/devd.conf
index d379ab0..5339bae 100644
--- a/etc/devd.conf
+++ b/etc/devd.conf
@@ -34,7 +34,7 @@ options {
 # NB: DETACH events are ignored; the kernel should handle all cleanup
 #     (routes, arp cache).  Beware of races against immediate create
 #     of a device with the same name; e.g.
-#	ifconfig bridge0 destroy; ifconfig bridge0 create
+#     ifconfig bridge0 destroy; ifconfig bridge0 create
 #
 notify 0 {
 	match "system"		"IFNET";
@@ -165,7 +165,7 @@ notify 100 {
 };
 
 #
-# Rescan scsi device-names on attach, but not detach.  However, it is
+# Rescan SCSI device-names on attach, but not detach.  However, it is
 # disabled by default due to reports of problems.
 #
 attach 0 {
@@ -305,13 +305,13 @@ detach 10 {
 # events.  See the ACPI specification for more information about
 # notifies.  Here is the information returned for each subsystem:
 #
-# ACAD:		AC line state (0 is offline, 1 is online)
-# Button:	Button pressed (0 for power, 1 for sleep)
-# CMBAT:	ACPI battery events
-# Lid:		Lid state (0 is closed, 1 is open)
-# RCTL:		Resource limits
+# ACAD:            AC line state (0 is offline, 1 is online)
+# Button:          Button pressed (0 for power, 1 for sleep)
+# CMBAT:           ACPI battery events
+# Lid:             Lid state (0 is closed, 1 is open)
+# RCTL:            Resource limits
 # Suspend, Resume: Suspend and resume notification
-# Thermal:	ACPI thermal zone events
+# Thermal:         ACPI thermal zone events
 #
 # This example calls a script when the AC state changes, passing the
 # notify value as the first argument.  If the state is 0x00, it might
diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf
index d3090ab..b1dc797 100644
--- a/etc/devd/usb.conf
+++ b/etc/devd/usb.conf
@@ -120,7 +120,23 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x03f0";
-	match "product" "(0x2016|0x2116|0x2216|0x3016|0x3116|0x3216)";
+	match "product" "(0x2016|0x2116|0x2216|0x3016|0x3116)";
+	action "kldload -n uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x03f0";
+	match "product" "0x311d";
+	action "kldload -n ng_ubt";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x03f0";
+	match "product" "0x3216";
 	action "kldload -n uipaq";
 };
 
@@ -168,7 +184,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0403";
-	match "product" "(0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|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|0xed74|0xee18|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0xeeee|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" "(0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|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|0xed74|0xee18|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0xeeee|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";
 };
 
@@ -280,7 +296,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0411";
-	match "product" "(0x0116|0x0119)";
+	match "product" "(0x00f4|0x0116|0x0119)";
 	action "kldload -n if_rum";
 };
 
@@ -423,6 +439,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0489";
+	match "product" "(0xe027|0xe02c|0xe036|0xe03c|0xe03d|0xe04e|0xe056|0xe057)";
+	action "kldload -n ng_ubt";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0499";
 	match "product" "(0x1000|0x1001|0x1002|0x1003|0x1004|0x1005|0x1006|0x1007|0x1008|0x1009|0x100a|0x100c|0x100d|0x100e|0x100f|0x1010|0x1011|0x1012|0x1013|0x1014|0x1015|0x1016|0x1017|0x1018|0x1019|0x101a|0x101b|0x101c|0x101d|0x101e|0x101f|0x1020|0x1021|0x1022|0x1023|0x1024|0x1025|0x1026|0x1027|0x1028|0x1029|0x102a|0x102b|0x102e|0x1030|0x1031|0x1032|0x1033|0x1034|0x1035|0x1036|0x1037|0x1038|0x1039|0x103a|0x103b|0x103c|0x103d|0x103e|0x103f|0x1040|0x1041|0x1042|0x1043|0x1044|0x1045|0x104e|0x104f|0x1050|0x1051|0x1052|0x1053|0x1054|0x1055|0x1056|0x1057|0x1058|0x1059|0x105a|0x105b|0x105c|0x105d|0x1503|0x2000|0x2001|0x2002|0x2003|0x5000|0x5001|0x5002|0x5003|0x5004|0x5005|0x5006|0x5007|0x5008|0x5009|0x500a|0x500b|0x500c|0x500d|0x500e|0x500f|0x7000|0x7010)";
 	action "kldload -n snd_uaudio";
@@ -559,6 +583,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x04ca";
+	match "product" "(0x3005|0x3006|0x3008)";
+	action "kldload -n ng_ubt";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x04da";
 	match "product" "0x2500";
 	action "kldload -n uipaq";
@@ -800,7 +832,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0525";
-	match "product" "0x1080";
+	match "product" "(0x1080|0xa4a0)";
 	action "kldload -n udbp";
 };
 
@@ -1103,6 +1135,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x065a";
+	match "product" "(0xc000|0xc001)";
+	action "kldload -n uftdi";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x066b";
 	match "product" "(0x200c|0x2202)";
 	action "kldload -n if_aue";
@@ -1344,7 +1384,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0789";
-	match "product" "(0x0162|0x0163|0x0164|0x0166|0x0168)";
+	match "product" "(0x0162|0x0163|0x0164|0x0166|0x0168|0x0169)";
 	action "kldload -n if_run";
 };
 
@@ -1800,6 +1840,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0930";
+	match "product" "(0x0215|0x0219)";
+	action "kldload -n ng_ubt";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0930";
 	match "product" "(0x0700|0x0705|0x0706|0x0707|0x0708|0x0709|0x070a|0x070b)";
 	action "kldload -n uipaq";
 };
@@ -2375,6 +2423,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0cf3";
+	match "product" "(0x3002|0x3004|0x311d|0xe004|0xe019)";
+	action "kldload -n ng_ubt";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0d3a";
 	match "product" "0x0300";
 	action "kldload -n uftdi";
@@ -3224,15 +3280,39 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x13d3";
-	match "product" "(0x3247|0x3262|0x3273|0x3284|0x3305)";
+	match "product" "(0x3247|0x3262|0x3273|0x3284)";
+	action "kldload -n if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x13d3";
+	match "product" "0x3304";
+	action "kldload -n ng_ubt";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x13d3";
+	match "product" "0x3305";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x13d3";
+	match "product" "(0x3362|0x3375|0x3393)";
+	action "kldload -n ng_ubt";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x1410";
-	match "product" "(0x1100|0x1110|0x1120|0x1130|0x1400|0x1410|0x1420|0x1430|0x1450|0x2100|0x2110|0x2120|0x2130|0x2400|0x2410|0x2420|0x4100|0x4400|0x5010|0x5100|0x6000|0x6002|0x7042)";
+	match "product" "(0x1100|0x1110|0x1120|0x1130|0x1400|0x1410|0x1420|0x1430|0x1450|0x2100|0x2110|0x2120|0x2130|0x2400|0x2410|0x2420|0x4100|0x4400|0x5010|0x5041|0x5100|0x6000|0x6002|0x7042)";
 	action "kldload -n u3g";
 };
 
@@ -4040,7 +4120,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
-	match "product" "0x1a00";
+	match "product" "(0x1a00|0x1a02)";
 	action "kldload -n if_axe";
 };
 
@@ -4096,7 +4176,23 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
-	match "product" "(0x4001|0x4002|0x4003|0x400b|0x4102|0xabc1)";
+	match "product" "(0x4001|0x4002|0x4003|0x400b|0x4102)";
+	action "kldload -n if_aue";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x2001";
+	match "product" "(0x7e12|0xa805)";
+	action "kldload -n u3g";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x2001";
+	match "product" "0xabc1";
 	action "kldload -n if_aue";
 };
 
@@ -4215,6 +4311,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x22b8";
+	match "product" "0x710f";
+	action "kldload -n u3g";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x22de";
 	match "product" "0x6801";
 	action "kldload -n u3g";
@@ -4495,6 +4599,16 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0a5c";
+	match "intclass" "0xff";
+	match "intsubclass" "0x01";
+	match "intprotocol" "0x01";
+	action "kldload -n ng_ubt";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "intclass" "0x02";
 	match "intsubclass" "0x02";
 	match "intprotocol" "0x01";
@@ -4635,5 +4749,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2386 USB entries processed
+# 2422 USB entries processed
 
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 374889d..4ad7894 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -174,8 +174,6 @@
         ..
         nullfs
         ..
-        portalfs
-        ..
         procfs
         ..
         udf
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 89ec940..0064d10 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -22,14 +22,14 @@
         ..
         engines
         ..
-	i18n
-	..
+        i18n
+        ..
     ..
     lib32
-	dtrace
-	..
-	i18n
-	..
+        dtrace
+        ..
+        i18n
+        ..
     ..
     libdata
         gcc
@@ -40,8 +40,8 @@
         ..
     ..
     libexec
-	bsdinstall
-	..
+        bsdinstall
+        ..
         lpr
             ru
             ..
@@ -207,7 +207,7 @@
         dtrace
             toolkit
             ..
-        ..  
+        ..
         examples
             BSD_daemon
             ..
@@ -217,6 +217,8 @@
             ..
             atf
             ..
+            bhyve
+            ..
             bootforth
             ..
             csh
@@ -328,79 +330,79 @@
             fortune
             ..
         ..
+        i18n
+            csmapper
+                APPLE
+                ..
+                AST
+                ..
+                BIG5
+                ..
+                CNS
+                ..
+                CP
+                ..
+                EBCDIC
+                ..
+                GB
+                ..
+                GEORGIAN
+                ..
+                ISO-8859
+                ..
+                ISO646
+                ..
+                JIS
+                ..
+                KAZAKH
+                ..
+                KOI
+                ..
+                KS
+                ..
+                MISC
+                ..
+                TCVN
+                ..
+            ..
+            esdb
+                APPLE
+                ..
+                AST
+                ..
+                BIG5
+                ..
+                CP
+                ..
+                DEC
+                ..
+                EBCDIC
+                ..
+                EUC
+                ..
+                GB
+                ..
+                GEORGIAN
+                ..
+                ISO-2022
+                ..
+                ISO-8859
+                ..
+                ISO646
+                ..
+                KAZAKH
+                ..
+                KOI
+                ..
+                MISC
+                ..
+                TCVN
+                ..
+                UTF
+                ..
+            ..
+        ..
         info
-	..
-	i18n
-	    csmapper
-		APPLE
-		..
-		AST
-		..
-		BIG5
-		..
-		CNS
-		..
-		CP
-		..
-		EBCDIC
-		..
-		GB
-		..
-		GEORGIAN
-		..
-		ISO-8859
-		..
-		ISO646
-		..
-		JIS
-		..
-		KAZAKH
-		..
-		KOI
-		..
-		KS
-		..
-		MISC
-		..
-		TCVN
-		..
-	    ..
-	    esdb
-		APPLE
-		..
-		AST
-		..
-		BIG5
-		..
-		CP
-		..
-		DEC
-		..
-		EBCDIC
-		..
-		EUC
-		..
-		GB
-		..
-		GEORGIAN
-		..
-		ISO-2022
-		..
-		ISO-8859
-		..
-		ISO646
-		..
-		KAZAKH
-		..
-		KOI
-		..
-		MISC
-		..
-		TCVN
-		..
-		UTF
-		..
-	    ..
         ..
         locale
             UTF-8
@@ -427,26 +429,26 @@
             ..
             ca_AD.ISO8859-1
             ..
-            ca_ES.ISO8859-1
-            ..
-            ca_FR.ISO8859-1
+            ca_AD.ISO8859-15
             ..
-            ca_IT.ISO8859-1
+            ca_AD.UTF-8
             ..
-            ca_AD.ISO8859-15
+            ca_ES.ISO8859-1
             ..
             ca_ES.ISO8859-15
             ..
-            ca_FR.ISO8859-15
-            ..
-            ca_IT.ISO8859-15
+            ca_ES.UTF-8
             ..
-            ca_AD.UTF-8
+            ca_FR.ISO8859-1
             ..
-            ca_ES.UTF-8
+            ca_FR.ISO8859-15
             ..
             ca_FR.UTF-8
             ..
+            ca_IT.ISO8859-1
+            ..
+            ca_IT.ISO8859-15
+            ..
             ca_IT.UTF-8
             ..
             cs_CZ.ISO8859-2
diff --git a/etc/periodic/daily/401.status-graid b/etc/periodic/daily/401.status-graid
new file mode 100755
index 0000000..a28fc5b
--- /dev/null
+++ b/etc/periodic/daily/401.status-graid
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# If there is a global system configuration file, suck it in.
+#
+if [ -r /etc/defaults/periodic.conf ]
+then
+    . /etc/defaults/periodic.conf
+    source_periodic_confs
+fi
+
+case "$daily_status_graid_enable" in
+    [Yy][Ee][Ss])
+	echo
+	echo 'Checking status of graid(8) devices:'
+
+	if graid status; then
+		components="$(graid status -s | fgrep -v OPTIMAL)"
+		if [ "${components}" ]; then
+			rc=3
+		else
+			rc=0
+		fi
+	else
+		rc=2
+	fi
+	;;
+
+    *)  rc=0;;
+esac
+
+exit $rc
diff --git a/etc/periodic/daily/405.status-ata-raid b/etc/periodic/daily/405.status-ata-raid
deleted file mode 100755
index f217839..0000000
--- a/etc/periodic/daily/405.status-ata-raid
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# If there is a global system configuration file, suck it in.
-#
-if [ -r /etc/defaults/periodic.conf ]
-then
-    . /etc/defaults/periodic.conf
-    source_periodic_confs
-fi
-
-case "$daily_status_ata_raid_enable" in
-    [Yy][Ee][Ss])
-	echo
-	echo 'Checking status of ATA raid partitions:'
-
-	rc=0
-	for raid in `find /dev/ -name 'ar[0-9]*' -type c | egrep '[0-9]$' \
-		| egrep -v 's[0-9]' | cut -d / -f 3`
-	     do
-		status=`/sbin/atacontrol status $raid`
-		echo $status
-		raid_rc=`echo $status | grep -v READY | wc -l`
-		[ $rc -eq 0 ] && [ $raid_rc -gt 0 ] && rc=3
-	     done
-	;;
-
-    *)  rc=0;;
-esac
-
-exit $rc
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index 9c7f4d7..b377be9 100644
--- a/etc/periodic/daily/Makefile
+++ b/etc/periodic/daily/Makefile
@@ -8,7 +8,7 @@ FILES=	100.clean-disks \
 	200.backup-passwd \
 	330.news \
 	400.status-disks \
-	405.status-ata-raid \
+	401.status-graid \
 	406.status-gmirror \
 	407.status-graid3 \
 	408.status-gstripe \
diff --git a/etc/portsnap.conf b/etc/portsnap.conf
index c209445..eca429f 100644
--- a/etc/portsnap.conf
+++ b/etc/portsnap.conf
@@ -30,6 +30,5 @@ KEYPRINT=9b5feee6d69f170e3dd0a2c8e469ddbd64f13f978f2f3aede40c98633216c330
 # REFUSE korean polish portuguese russian ukrainian vietnamese
 
 # List of INDEX files to build and the DESCRIBE file to use for each
-INDEX INDEX-7 DESCRIBE.7
 INDEX INDEX-8 DESCRIBE.8
 INDEX INDEX-9 DESCRIBE.9
diff --git a/etc/rc.d/rtadvd b/etc/rc.d/rtadvd
index 1ad40b8..562498c 100755
--- a/etc/rc.d/rtadvd
+++ b/etc/rc.d/rtadvd
@@ -46,6 +46,8 @@ rtadvd_precmd()
 			fi
 		done
 		;;
+	[Nn][Oo][Nn][Ee])
+		;;
 	*)
 		command_args="${rtadvd_interfaces}"
 		;;
diff --git a/etc/rc.d/savecore b/etc/rc.d/savecore
index 3e61adc..a39d5ba 100755
--- a/etc/rc.d/savecore
+++ b/etc/rc.d/savecore
@@ -23,6 +23,9 @@ savecore_prestart()
 		return 1
 		;;
 	[Aa][Uu][Tt][Oo])
+		if [ ! -L /dev/dumpdev ]; then
+			return 1
+		fi
 		dumpdev=`/bin/realpath /dev/dumpdev`
 		;;
 	esac
diff --git a/etc/rc.d/sysctl b/etc/rc.d/sysctl
index cc3e801..2420414 100755
--- a/etc/rc.d/sysctl
+++ b/etc/rc.d/sysctl
@@ -11,7 +11,7 @@ name="sysctl"
 command="/sbin/sysctl"
 stop_cmd=":"
 start_cmd="sysctl_start"
-reload_cmd="sysctl_start"
+reload_cmd="sysctl_start last"
 lastload_cmd="sysctl_start last"
 extra_commands="reload lastload"
 
@@ -19,10 +19,10 @@ sysctl_start()
 {
 	case $1 in
 	last)
-		command_args="-i -f"
+		command_args="-f"
 	;;
 	*)
-		command_args="-f"
+		command_args="-i -f"
 	;;
 	esac
 
diff --git a/etc/rc.resume b/etc/rc.resume
index b68f981..4d17190 100755
--- a/etc/rc.resume
+++ b/etc/rc.resume
@@ -43,10 +43,6 @@ if [ -r /var/run/rc.suspend.pid ]; then
 	echo 'rc.resume: killed rc.suspend that was still around'
 fi
 
-if [ -r /var/run/moused.pid ]; then
-	pkill -HUP -F /var/run/moused.pid
-fi
-
 # Turns on a power supply of a card in the slot inactivated.
 # See also contrib/pccardq.c (only for PAO users).
 # pccardq | awk -F '~' '$5 == "inactive" \
diff --git a/etc/rc.subr b/etc/rc.subr
index 9bff68b..bce2257 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -1285,7 +1285,7 @@ make_symlink()
 #
 devfs_rulesets_from_file()
 {
-	local file _err _me
+	local file _err _me _opts
 	file="$1"
 	_me="devfs_rulesets_from_file"
 	_err=0
@@ -1298,6 +1298,11 @@ devfs_rulesets_from_file()
 		debug "$_me: no such file ($file)"
 		return 0
 	fi
+
+	# Disable globbing so that the rule patterns are not expanded
+	# by accident with matching filesystem entries.
+	_opts=$-; set -f
+
 	debug "reading rulesets from file ($file)"
 	{ while read line
 	do
@@ -1344,6 +1349,7 @@ devfs_rulesets_from_file()
 			break
 		fi
 	done } < $file
+	case $_opts in *f*) ;; *) set +f ;; esac
 	return $_err
 }