minor fixes for one time, post cvsup, reboot

tmcd/freebsd/GNUmakefile.in

@@ -53,10 +53,10 @@ script-install:	dir-install
 	$(INSTALL) -m 644 $(SRCDIR)/hosts $(INSTALL_DIR)/hosts
 	$(INSTALL) -m 755 $(SRCDIR)/dhclient-exit-hooks \
 		/etc/dhclient-exit-hooks
-	$(INSTALL) -m 755 $(SRCDIR)/nodetype /etc/testbed/nodetype
-	$(INSTALL) -m 755 $(SRCDIR)/chipset.awk /etc/testbed/chipset.awk
-	$(INSTALL) -m 755 $(SRCDIR)/cpuspeed.awk /etc/testbed/cpuspeed.awk
-	$(INSTALL) -m 755 $(SRCDIR)/control_interface /etc/testbed/control_interface
+	$(INSTALL) -m 755 $(SRCDIR)/nodetype $(INSTALL_DIR)/nodetype
+	$(INSTALL) -m 755 $(SRCDIR)/chipset.awk $(INSTALL_DIR)/chipset.awk
+	$(INSTALL) -m 755 $(SRCDIR)/cpuspeed.awk $(INSTALL_DIR)/cpuspeed.awk
+	$(INSTALL) -m 755 $(SRCDIR)/control_interface $(INSTALL_DIR)/control_interface
 	$(INSTALL) -m 755 $(SRCDIR)/start_if.fxp0 /etc/start_if.fxp0
 	$(INSTALL) -m 755 $(SRCDIR)/start_if.fxp2 /etc/start_if.fxp2
 	$(INSTALL) -m 755 $(SRCDIR)/start_if.fxp4 /etc/start_if.fxp4

tmcd/freebsd/control_interface

@@ -2,12 +2,12 @@
 
 NODETYPE=`/etc/testbed/nodetype`
 
-if [ $NODETYPE = 'pc600' ]; then
+if [ "$NODETYPE" = 'pc600' ]; then
     echo 'fxp4'
-elif [ $NODETYPE = 'pc850' ]; then
+elif [ "$NODETYPE" = 'pc850' ]; then
     echo 'fxp0'
-elif [ $NODETYPE = 'pcL440GX' ]; then
+elif [ "$NODETYPE" = 'pcL440GX' ]; then
     echo 'fxp2'
-elif [ $NODETYPE = 'pc1500' ]; then
+elif [ "$NODETYPE" = 'pc1500' ]; then
     echo 'xl0'
 fi

tmcd/freebsd/nodetype

@@ -13,8 +13,10 @@ if [ x$cpuspeed = x ] || [ $cpuspeed = 0 ]; then
 elif [ $cpuspeed = "850" -a -x '/etc/testbed/chipset.awk' ]; then
 	if [ `/etc/testbed/chipset.awk /var/run/dmesg.boot` = "GX" ]; then
 		echo pcL440GX;
+	else
+		echo pc$cpuspeed;
 	fi
 
-else   
+else
 	echo pc$cpuspeed;
 fi

tmcd/linux/nodetype

@@ -13,6 +13,8 @@ if [ x$cpuspeed = x ] || [ $cpuspeed = 0 ]; then
 elif [ $cpuspeed = "850" -a -x '/etc/rc.d/testbed/chipset.awk' ]; then
 	if [ `/etc/rc.d/testbed/chipset.awk /proc/pci` = "GX" ]; then
 		echo pcL440GX;
+	else
+		echo pc$cpuspeed;
 	fi
 
 else