MFhead@r313243

7 files changed, 24 insertions, 61 deletions

diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf
index 3c6e560810d1..c9a072d104c5 100644
--- a/etc/devd/usb.conf
+++ b/etc/devd/usb.conf
@@ -2753,7 +2753,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
-	match "product" "(0x818a|0x8191)";
+	match "product" "(0x818a|0x818b|0x8191)";
 	action "kldload -n if_rtwn_usb";
 };
 
@@ -3793,7 +3793,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1199";
-	match "product" "(0x68aa|0x68c0|0x9041)";
+	match "product" "(0x68aa|0x68c0|0x9041|0x9071)";
 	action "kldload -n u3g";
 };
 
@@ -3905,7 +3905,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x12d1";
-	match "product" "(0x1573|0x1803|0x1c05|0x1c0b)";
+	match "product" "(0x1573|0x15c1|0x1803|0x1c05|0x1c0b)";
 	action "kldload -n u3g";
 };
 
@@ -5025,7 +5025,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
-	match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d|0x330f|0x3310|0x3314|0x3315|0x3316|0x3318)";
+	match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d|0x330f|0x3310|0x3314|0x3315|0x3316|0x3318|0x3319)";
 	action "kldload -n if_rtwn_usb";
 };
 
@@ -5297,7 +5297,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2357";
-	match "product" "0x0101";
+	match "product" "(0x0101|0x0108|0x0109)";
 	action "kldload -n if_rtwn_usb";
 };
 
@@ -5889,5 +5889,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2743 USB entries processed
+# 2751 USB entries processed
 
diff --git a/etc/etc.pc98/ttys b/etc/etc.pc98/ttys
deleted file mode 100644
index d75cf053ab0d..000000000000
--- a/etc/etc.pc98/ttys
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# $FreeBSD$
-#	@(#)ttys	5.1 (Berkeley) 4/17/89
-#
-# This file specifies various information about terminals on the system.
-# It is used by several different programs.  Common entries for the
-# various columns include:
-#
-# name  The name of the terminal device.
-#
-# getty The program to start running on the terminal.  Typically a
-#       getty program, as the name implies.  Other common entries
-#       include none, when no getty is needed, and xdm, to start the
-#       X Window System.
-#
-# type The initial terminal type for this port.  For hardwired
-#      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25w.
-#      Other common values include dialup for incoming modem ports, and
-#      unknown when the terminal type cannot be predetermined.
-#
-# status Must be on or off.  If on, init will run the getty program on
-#        the specified port.  If the word "secure" appears, this tty
-#        allows root login.
-#
-# name	getty				type	status		comments
-#
-# If console is marked "insecure", then init will ask for the root password
-# when going to single-user mode.
-console	none				unknown	off secure
-#
-ttyv0	"/usr/libexec/getty Pc"		cons25w	on  secure
-# Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25w	on  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25w	on  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25w	on  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25w	on  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25w	on  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25w	on  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25w	on  secure
-ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
-# Serial terminals
-# The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyu0	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
-ttyu1	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
-ttyu2	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
-ttyu3	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
-# Dumb console
-dcons	"/usr/libexec/getty std.9600"	vt100	off secure
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index 4ca8413103a8..6785605fd01c 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -40,8 +40,6 @@
                 ..
                 i18n
                 ..
-                private
-                ..
             ..
             libexec
                 bsdinstall
diff --git a/etc/periodic/daily/999.local b/etc/periodic/daily/999.local
index 317347526e79..eca04e5771b8 100755
--- a/etc/periodic/daily/999.local
+++ b/etc/periodic/daily/999.local
@@ -20,7 +20,12 @@ do
     echo ''
     case "$script" in
 	/*)
-	    if [ -f "$script" ]
+	    if [ -x "$script" ]
+	    then
+		echo "Running $script:"
+
+		$script || rc=3
+	    elif [ -f "$script" ]
 	    then
 		echo "Running $script:"
 
diff --git a/etc/periodic/monthly/999.local b/etc/periodic/monthly/999.local
index 4e7c2b991b90..a017a69540e5 100755
--- a/etc/periodic/monthly/999.local
+++ b/etc/periodic/monthly/999.local
@@ -17,7 +17,12 @@ do
     echo ''
     case "$script" in
 	/*)
-	    if [ -f "$script" ]
+	    if [ -x "$script" ]
+	    then
+		echo "Running $script:"
+
+		$script || rc=3
+	    elif [ -f "$script" ]
 	    then
 		echo "Running $script:"
 
diff --git a/etc/periodic/weekly/999.local b/etc/periodic/weekly/999.local
index 3951bb584d27..cc40c07c8840 100755
--- a/etc/periodic/weekly/999.local
+++ b/etc/periodic/weekly/999.local
@@ -17,7 +17,12 @@ do
     echo ''
     case "$script" in
 	/*)
-	    if [ -f "$script" ]
+	    if [ -x "$script" ]
+	    then
+		echo "Running $script:"
+
+		$script || rc=3
+	    elif [ -f "$script" ]
 	    then
 		echo "Running $script:"
 
diff --git a/etc/rc.d/syscons b/etc/rc.d/syscons
index 3a6ff18f6ec4..7c0c8035be2e 100755
--- a/etc/rc.d/syscons
+++ b/etc/rc.d/syscons
@@ -112,7 +112,6 @@ icelandic.iso)			echo is;;
 it.iso)				echo it;;
 jp.106x)			echo jp.capsctrl;;
 jp.106)				echo jp;;
-#?? jp.pc98.iso)		echo jp.pc98;;
 kk.pt154.io)			echo kz.io;;
 kk.pt154.kst)			echo kz.kst;;
 latinamerican.iso.acc)		echo latinamerican.acc;;