[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

[zrouter-src-freebsd at zrouter.org]

details:   http://zrouter.org/hg/FreeBSD/head//rev/2e6bba6db6c3
changeset: 348:2e6bba6db6c3
user:      ray at terran.dlink.ua
date:      Fri Mar 02 16:51:11 2012 +0200
description:
Update to FreeBSD-HEAD @232391

diffstat:

 head/release/doc/en_US.ISO8859-1/hardware/article.sgml |  12 +++++++++++-
 head/release/doc/share/misc/dev.archlist.txt           |   5 ++++-
 head/release/picobsd/tinyware/passwd/Makefile          |   4 ++--
 head/release/rc.local                                  |  13 ++++++++++---
 4 files changed, 27 insertions(+), 7 deletions(-)

diffs (156 lines):

diff -r 6bc1ed3b57c3 -r 2e6bba6db6c3 head/release/doc/en_US.ISO8859-1/hardware/article.sgml
--- a/head/release/doc/en_US.ISO8859-1/hardware/article.sgml	Fri Mar 02 16:50:56 2012 +0200
+++ b/head/release/doc/en_US.ISO8859-1/hardware/article.sgml	Fri Mar 02 16:51:11 2012 +0200
@@ -17,7 +17,7 @@
 
     <corpauthor>The &os; Documentation Project</corpauthor>
 
-    <pubdate>$FreeBSD: head/release/doc/en_US.ISO8859-1/hardware/article.sgml 229977 2012-01-11 18:38:52Z brueffer $</pubdate>
+    <pubdate>$FreeBSD: head/release/doc/en_US.ISO8859-1/hardware/article.sgml 232376 2012-03-02 05:16:53Z mav $</pubdate>
 
     <copyright>
       <year>2000</year>
@@ -748,6 +748,8 @@
 
       &hwlist.ahc;
 
+      &hwlist.ahci;
+
       &hwlist.ahd;
 
       &hwlist.aic;
@@ -788,6 +790,8 @@
 
       &hwlist.ips;
 
+      &hwlist.isci;
+
       &hwlist.isp;
 
       &hwlist.mfi;
@@ -816,6 +820,8 @@
 
       &hwlist.pst;
 
+      &hwlist.siis;
+
       &hwlist.stg;
 
       &hwlist.sym;
@@ -954,6 +960,8 @@
 
       &hwlist.nxge;
 
+      &hwlist.oce;
+
       &hwlist.pcn;
 
       &hwlist.qlxgb;
@@ -1405,6 +1413,8 @@
 
       &hwlist.snd.hda;
 
+      &hwlist.snd.hdspe;
+
       &hwlist.snd.ich;
 
       &hwlist.snd.maestro;
diff -r 6bc1ed3b57c3 -r 2e6bba6db6c3 head/release/doc/share/misc/dev.archlist.txt
--- a/head/release/doc/share/misc/dev.archlist.txt	Fri Mar 02 16:50:56 2012 +0200
+++ b/head/release/doc/share/misc/dev.archlist.txt	Fri Mar 02 16:51:11 2012 +0200
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: head/release/doc/share/misc/dev.archlist.txt 229977 2012-01-11 18:38:52Z brueffer $
+# $FreeBSD: head/release/doc/share/misc/dev.archlist.txt 232355 2012-03-01 19:54:35Z brueffer $
 #
 
 #
@@ -80,6 +80,7 @@
 ie	i386
 iir	i386,ia64,amd64
 ips	i386,amd64
+isci	i386,amd64
 ixgb	i386,amd64
 kue	i386,pc98,ia64,amd64,powerpc
 lge	i386,pc98,amd64
@@ -97,6 +98,7 @@
 nsp	i386,pc98
 nve	i386,amd64
 nxge	i386,amd64
+oce	i386,amd64
 ohci	i386,pc98,ia64,amd64,powerpc
 oltr	i386
 pcn	i386,pc98,ia64,amd64
@@ -129,6 +131,7 @@
 snd_fm801	i386,amd64
 snd_gusc	i386,amd64
 snd_hda	i386,amd64
+snd_hdspe	i386,amd64
 snd_ich	i386,amd64
 snd_maestro	i386,amd64
 snd_maestro3	i386,amd64
diff -r 6bc1ed3b57c3 -r 2e6bba6db6c3 head/release/picobsd/tinyware/passwd/Makefile
--- a/head/release/picobsd/tinyware/passwd/Makefile	Fri Mar 02 16:50:56 2012 +0200
+++ b/head/release/picobsd/tinyware/passwd/Makefile	Fri Mar 02 16:51:11 2012 +0200
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: head/release/picobsd/tinyware/passwd/Makefile 231118 2012-02-07 09:27:07Z dim $
 
 # Only NO_PAM is used by PicoBSD and supported here
 
@@ -26,7 +26,7 @@
 
 CLEANFILES= ${GENSRCS}
 
-RPCGEN= rpcgen -C
+RPCGEN=	RPCGEN_CPP=${CPP:Q} rpcgen -C
 RPCSRC= ${DESTDIR}/usr/include/rpcsvc/yp.x
 RPCSRC_PW= ${DESTDIR}/usr/include/rpcsvc/yppasswd.x
 RPCSRC_PRIV= ${.CURDIR}/../../usr.sbin/rpc.yppasswdd/yppasswd_private.x
diff -r 6bc1ed3b57c3 -r 2e6bba6db6c3 head/release/rc.local
--- a/head/release/rc.local	Fri Mar 02 16:50:56 2012 +0200
+++ b/head/release/rc.local	Fri Mar 02 16:51:11 2012 +0200
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: head/release/rc.local 230484 2012-01-23 16:17:54Z nwhitehorn $
+# $FreeBSD: head/release/rc.local 231123 2012-02-07 10:59:19Z nyan $
 
 : ${DIALOG_OK=0}
 : ${DIALOG_CANCEL=1}
@@ -8,17 +8,23 @@
 : ${DIALOG_ITEM_HELP=4}
 : ${DIALOG_ESC=255}
 
+MACHINE=`uname -m`
+
 kbdcontrol -d >/dev/null 2>&1
 if [ $? -eq 0 ]; then
 	# Syscons: use xterm, start interesting things on other VTYs
-	TERM=xterm
+	if [ ${MACHINE} = "pc98" ]; then
+		TERM=cons25w
+	else
+		TERM=xterm
+	fi
 
 	if [ -z "$EXTERNAL_VTY_STARTED" ]; then
 		# Init will clean these processes up if/when the system
 		# goes multiuser
 		touch /tmp/bsdinstall_log
 		tail -f /tmp/bsdinstall_log > /dev/ttyv2 &
-		/usr/libexec/getty autologin ttyv3
+		/usr/libexec/getty autologin ttyv3 &
 		EXTERNAL_VTY_STARTED=1
 	fi
 else
@@ -31,6 +37,7 @@
 	echo "   ansi     Standard ANSI terminal"
 	echo "   vt100    VT100 or compatible terminal"
 	echo "   xterm    xterm terminal emulator (or compatible)"
+	echo "   cons25w  cons25w terminal"
 	echo
 	echo -n "Console type [vt100]: "
 	read TERM