Copy over a new mkextrafs.pl to boss/ops/fs nodes with old OS images.

A new feature of mkextrafs (-2) is rather critical to the new disk layout.
Rather than support old/new style disk layouts, just copy over a new mkextrafs
(as we do with rc.mkelab) so that images without the new version of the
script will work as boss/ops.

tbsetup/elabinelab.in

@@ -277,17 +277,23 @@ $UID = 0;
 # This is temporary. I think I will switch this over to grabbing the latest
 # version from the web server.
 #
+# XXX ugh, copy over a newer mkextrafs.pl as well (one that supports -2).
+#
 my $mkelab = "$TB/etc/rc.mkelab";
 if (-e "$expdir/rc.mkelab") {
     $mkelab = "$expdir/rc.mkelab";
 }
-print "Copying $mkelab to ${bossnode}/${opsnode}";
+my $mkextrafs = "";
+if (-e "$TB/etc/mkextrafs.pl") {
+    $mkextrafs = "$TB/etc/mkextrafs.pl";
+}
+print "Copying $mkelab $mkextrafs to ${bossnode}/${opsnode}";
 print "/${fsnode}"
     if (defined($fsnode));
 print "\n";
-system("scp $mkelab ${bossnode}:/tmp");
-system("scp $mkelab ${opsnode}:/tmp");
-system("scp $mkelab ${fsnode}:/tmp")
+system("scp $mkelab $mkextrafs ${bossnode}:/tmp");
+system("scp $mkelab $mkextrafs ${opsnode}:/tmp");
+system("scp $mkelab $mkextrafs ${fsnode}:/tmp")
     if (defined($fsnode));
 
 if (defined($fsnode)) {

tmcd/common/config/rc.mkelab

@@ -311,6 +311,17 @@ $emulabconfig{"LOADPACKAGES"} = 0;
 $emulabconfig{"LOADMFS"} = 0;
 $emulabconfig{"LOADELABSOURCE"} = 0;
 
+    #
+    # XXX Copy in new mkextrafs if necessary
+    #
+    if (-e "/tmp/mkextrafs.pl") {
+	# only copy if newer
+	if (! -e "$BINDIR/mkextrafs.pl" ||
+	    (stat("/tmp/mkextrafs.pl"))[9] > (stat("$BINDIR/mkextrafs.pl"))[9]) {
+	    mysystem("cp /tmp/mkextrafs.pl $BINDIR/");
+	}
+    }
+
     #
     # XXX To avoid NFS errors while copying goo from outer boss.
     #