sigh...had to move control interface on minitestbed nodes (fxp2 -> fxp1)

tmcd/freebsd/GNUmakefile.in

@@ -58,10 +58,10 @@ script-install:	dir-install
 	$(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.fxp1 /etc/start_if.fxp1
 	$(INSTALL) -m 755 $(SRCDIR)/start_if.fxp4 /etc/start_if.fxp4
 	$(INSTALL) -m 755 $(SRCDIR)/start_if.xl0 /etc/start_if.xl0
 	$(INSTALL) -m 755 $(SRCDIR)/rc.route $(INSTALL_DIR)/rc.route
 	$(INSTALL) -m 644 $(SRCDIR)/gated_fxp0.conf $(INSTALL_DIR)/gated_fxp0.conf
-	$(INSTALL) -m 644 $(SRCDIR)/gated_fxp2.conf $(INSTALL_DIR)/gated_fxp2.conf
+	$(INSTALL) -m 644 $(SRCDIR)/gated_fxp1.conf $(INSTALL_DIR)/gated_fxp1.conf
 	$(INSTALL) -m 644 $(SRCDIR)/gated_fxp4.conf $(INSTALL_DIR)/gated_fxp4.conf

tmcd/freebsd/control_interface

@@ -7,7 +7,7 @@ if [ "$NODETYPE" = 'pc600' ]; then
 elif [ "$NODETYPE" = 'pc850' ]; then
     echo 'fxp0'
 elif [ "$NODETYPE" = 'pcL440GX' ]; then
-    echo 'fxp2'
+    echo 'fxp1'
 elif [ "$NODETYPE" = 'pc1500' ]; then
     echo 'xl0'
 fi

tmcd/freebsd/gated_fxp2.conf → tmcd/freebsd/gated_fxp1.conf

@@ -16,12 +16,12 @@ rip off;
 # 
 ospf on {
     backbone {
-	interface fxp2 { passive; };
+	interface fxp1 { passive; };
     };
     area 0.0.0.2 {
         authtype none;
-	# XXX current fxp2 control boxes only have 2 experimental IFs
+	# XXX current fxp1 control boxes only have 2 experimental IFs
 	interface fxp0 { priority 1; };
-	interface fxp1 { priority 1; };
+	interface fxp2 { priority 1; };
     };
 };

tmcd/freebsd/start_if.fxp1

+#!/bin/sh
+
+if [ `/etc/testbed/control_interface` = 'fxp1' ]; then
+	dhcp_interfaces="$dhcp_interfaces fxp1";
+fi

tmcd/freebsd/start_if.fxp2

-#!/bin/sh
-
-if [ `/etc/testbed/control_interface` = 'fxp2' ]; then
-	dhcp_interfaces="$dhcp_interfaces fxp2";
-fi