Support for "pc850a", an upgraded pc600.

Needs to be a distinct type in the client scripts since its control
interface is not the same as a true pc850.

tmcd/freebsd/chipset.awk

 #!/usr/bin/awk -f
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2002 University of Utah and the Flux Group.
+# Copyright (c) 2000-2003 University of Utah and the Flux Group.
 # All rights reserved.
 #
 
-/^pcib0: <Intel [0-9][0-9][0-9][0-9][0-9]BX / {
+#
+# "true" pc850 reports:
+#    pcib0: <Intel 82443BX host to PCI bridge (AGP disabled)> on motherboard
+# upgraded pc600 reports:
+#    pcib0: <Intel 82443BX (440 BX) host to PCI bridge> on motherboard
+#
+/^pcib0: <Intel [0-9][0-9][0-9][0-9][0-9]BX .*(AGP disabled)>/ {
     print "BX";
-    next
+    exit
+}
+/^pcib0: <Intel [0-9][0-9][0-9][0-9][0-9]BX / {
+    print "BX-AGP";
+    exit
 }
 /^pcib0: <Intel [0-9][0-9][0-9][0-9][0-9]GX / {
     print "GX";
-    next
+    exit
 }
 /^pcib0:.*/ {
     print "??";
-    next
+    exit
 }

tmcd/freebsd/control_interface

@@ -7,7 +7,7 @@
 
 . /etc/emulab/paths.sh
 
-NODETYPE=`nodetype`
+NODETYPE=`$BINDIR/nodetype`
 case $NODETYPE in
 pc300|pc850|i2|pc1800)
     echo 'fxp0'
@@ -15,7 +15,7 @@ pc300|pc850|i2|pc1800)
 pcL440GX)
     echo 'fxp1'
     ;;
-pc600)
+pc600|pc850a)
     echo 'fxp4'
     ;;
 pc1500|pc2000)

tmcd/freebsd/nodetype

 #!/bin/sh
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2002 University of Utah and the Flux Group.
+# Copyright (c) 2000-2003 University of Utah and the Flux Group.
 # All rights reserved.
 #
 . /etc/emulab/paths.sh
@@ -15,14 +15,22 @@ fi
 if [ x$cpuspeed = x ] || [ $cpuspeed = 0 ]; then
 	echo "unknown";
 
-# XXX hack for minibed
+# XXX hack for minibed and buff pc600s
 elif [ $cpuspeed = "850" -a -x $BINDIR/chipset.awk ]; then
-	if [ `$BINDIR/chipset.awk /var/run/dmesg.boot` = "GX" ]; then
-		echo pcL440GX;
-	else
-		echo pc$cpuspeed;
-	fi
-
+    case `$BINDIR/chipset.awk /var/run/dmesg.boot` in
+    BX)
+	echo pc850	# normal pc850
+	;;
+    GX)
+	echo pcL440GX	# minibed node
+	;;
+    BX-AGP)
+	echo pc850a    # buff pc600 node
+	;;
+    *)
+	echo unknown
+   	;;
+esac
 # For Wiconsin nodes - they have a different node typing scheme
 elif [ $cpuspeed = "2500" ]; then
 	echo i2;