More tweaks to powder fixed node build.

install/phases/boss/powder-fixed

@@ -29,7 +29,7 @@ my $SQLSTUFF     = "$TOP_SRCDIR/install/$TARGETSYS_DIR/tbdb.sql";
 my %TYPEFILES    = ("nuc8650" =>
 		        "$TOP_SRCDIR/install/$TARGETSYS_DIR/nuc8650.xml",
 		    "nuc8559" =>
-		        "$TOP_SRCDIR/install/$TARGETSYS_DIR/nuc8650.xml",
+		        "$TOP_SRCDIR/install/$TARGETSYS_DIR/nuc8559.xml",
 		    "iris030" =>
 		    "$TOP_SRCDIR/install/$TARGETSYS_DIR/iris030.xml");
 
@@ -273,6 +273,42 @@ sub Install($$$)
 	    PhaseSucceed("NAT Done");
 	};
 
+	#
+	# Create a local named forward fragment file with some extra stuff.
+	#
+	my $forwarddots;
+	my @forward_strings = ();
+	my @reverse_strings = ();
+	my %local_dns = ("TARGETSYS_ROUTER" => "control");
+
+	foreach my $name (keys(%local_dns)) {
+	    next
+		if (!exists($configvars{$name}));
+
+	    my $hostname = $local_dns{$name};
+	    my $ip = $configvars{$name};
+	    my ($a,$b,$c,$num) = split(/\./, $ip);
+	    $forwarddots = "${a}.${b}.${c}";
+	    
+	    push(@forward_strings, "$hostname\tIN\tA\t$ip");
+	    push(@reverse_strings, "$num\tIN\tPTR\t${hostname}.${OURDOMAIN}.");
+	}
+	my $FORWARDFRAGMENT1 = "$NAMED_DIR/${OURDOMAIN}.internal.db.local";
+	my $FORWARDFRAGMENT2 = "$NAMED_DIR/${OURDOMAIN}.db.local";
+	my $REVERSEFRAGMENT  = "$NAMED_DIR/reverse/${forwarddots}.db.local";
+	Phase "forward1", "Creating $FORWARDFRAGMENT1", sub {
+	    DoneIfExists($FORWARDFRAGMENT1);
+	    CreateFileFatal($FORWARDFRAGMENT1, @forward_strings);
+	};
+	Phase "forward2", "Creating $FORWARDFRAGMENT2", sub {
+	    DoneIfExists($FORWARDFRAGMENT2);
+	    CreateFileFatal($FORWARDFRAGMENT2, @forward_strings);
+	};
+	Phase "reverse", "Creating $REVERSEFRAGMENT", sub {
+	    DoneIfExists($REVERSEFRAGMENT);
+	    CreateFileFatal($REVERSEFRAGMENT, @reverse_strings);
+	};
+
 	#
 	# Munge /etc/rc.conf for real boot.
 	#

install/phases/ops/targetsys

@@ -154,6 +154,7 @@ sub Install($$$)
 	#
 	# Also grab the port source while close to the server.
 	#
+	if (0) {
 	Phase "portsrc", "Getting port source tarball", sub {
 	    DoneIfExists("$PREFIX/ports.tar.gz");
 	    FetchFileFatal($PORTSRC, "$PREFIX/ports.tar.gz");
@@ -167,6 +168,7 @@ sub Install($$$)
 		if (-e "/usr/ports" && -d "/usr/ports");
 	    ExecQuietFatal("cd /usr; ln -sf testbed/ports .");
 	};
+	}
 	
 	#
 	# Add named forwarders to resolv.conf to avoid failures

install/powder-fixed/powder.ns

@@ -50,6 +50,7 @@ tb-set-elabinelab-role-attribute boss XEN_CORES 2
 
 # Nucs need the latest.
 tb-set-elabinelab-attribute MFSVERSION "11-64"
+tb-set-elabinelab-attribute MFSCONSOLE vga
 
 # Extra stuff for devel in elabinelab.
 tb-set-elabinelab-role-attribute boss XEN_NOANTISPOOFING yes

install/powder-fixed/tbdb.sql

-INSERT INTO `node_types`
+REPLACE INTO `node_types`
   VALUES ('power','powduino',NULL,NULL,NULL,0,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `node_type_attributes`
+REPLACE INTO `node_type_attributes`
   VALUES ('powduino','rebootable','0','boolean');
-INSERT INTO `node_type_attributes`
+REPLACE INTO `node_type_attributes`
   VALUES ('powduino','imageable','0','boolean');
-INSERT into `nodes` set
+REPLACE into `nodes` set
       node_id='powduino',phys_nodeid='powduino',
       type='powduino',role='powerctrl';
-INSERT into `outlets` set
+REPLACE into `outlets` set
       node_id='nuc1',power_id='powduino',outlet='0';
-INSERT into `outlets` set
+REPLACE into `outlets` set
       node_id='nuc2',power_id='powduino',outlet='1';
-INSERT into `outlets` set
+REPLACE into `outlets` set
       node_id='iris1',power_id='powduino',outlet='2';