Clean up some update turds.

Cody updated his year old elabinelab and uncovered some problems with the
update process.  Note the updates to the install/updates scripts are just
to add "MASTER_SITE_FREEBSD=1" to the make lines.  This doesn't change
anything functionally, it just speeds up the builds for older FreeBSDs where
some of the MASTER_SITEs no longer exist.

install/updates/5/4

@@ -20,14 +20,14 @@ sub InstallUpdate($$)
 	Phase "p5-Crypt-X509", "Checking for port p5-Crypt-X509", sub {
 	    DoneIfPackageInstalled("p5-Crypt-X509");
 	    ExecQuietFatal("cd $PORTSDIR/security/p5-Crypt-X509; ".
-			   "make -DBATCH install");
+			   "make MASTER_SITE_FREEBSD=1 -DBATCH install");
 	};
     
 	Phase "p5-Crypt-OpenSSL-X509",
 	      "Checking for port p5-Crypt-OpenSSL-X509", sub {
 	    DoneIfPackageInstalled("p5-Crypt-OpenSSL-X509");
 	    ExecQuietFatal("cd $PORTSDIR/security/p5-Crypt-OpenSSL-X509; ".
-			   "make -DBATCH install");
+			   "make MASTER_SITE_FREEBSD=1 -DBATCH install");
 	};
     }
     

install/updates/5/8

@@ -20,7 +20,7 @@ sub InstallUpdate($$)
 		DoneIfPackageInstalled("xerces");
 		ExecQuietFatal("cd $PORTSDIR/textproc/xerces-c2; ".
 			       "make clean; make rmconfig; ".
-			       "make -DBATCH WITH_DEBUG=on install");
+			       "make MASTER_SITE_FREEBSD=1 -DBATCH WITH_DEBUG=on install");
 	    };
 	    Phase "reconfig", "Checking to see if reconfigure needed", sub {
 		PhaseSkip("No reconfig needed")

sql/sitevars-create.sql

@@ -61,10 +61,10 @@ INSERT INTO sitevariables VALUES ('elabinelab/boss_pkg_dir',NULL,'/share/freebsd
 INSERT INTO sitevariables VALUES ('elabinelab/ops_pkg',NULL,'emulab-ops-1.4','Name of ops node install package (DEPRECATED)',0);
 INSERT INTO sitevariables VALUES ('elabinelab/ops_pkg_dir',NULL,'/share/freebsd/packages/FreeBSD-4.10-20041102','Path from which to fetch ops packages (DEPRECATED)',0);
 INSERT INTO sitevariables VALUES ('elabinelab/windows','1','0','Turn on Windows support in inner Emulab',0);
-INSERT INTO `sitevariables` VALUES ('elabinelab/singlenet',NULL,'0','Default control net config. 0==use inner cnet, 1==use real cnet',1);
-INSERT INTO `sitevariables` VALUES ('elabinelab/boss_osid',NULL,'','Default (emulab-ops) OSID to boot on boss node. Empty string means use node_type default OSID',1);
-INSERT INTO `sitevariables` VALUES ('elabinelab/ops_osid',NULL,'','Default (emulab-ops) OSID to boot on ops node. Empty string means use node_type default OSID',1);
-INSERT INTO `sitevariables` VALUES ('elabinelab/fs_osid',NULL,'','Default (emulab-ops) OSID to boot on fs node. Empty string means use node_type default OSID',1);
+INSERT INTO sitevariables VALUES ('elabinelab/singlenet',NULL,'0','Default control net config. 0==use inner cnet, 1==use real cnet',1);
+INSERT INTO sitevariables VALUES ('elabinelab/boss_osid',NULL,'','Default (emulab-ops) OSID to boot on boss node. Empty string means use node_type default OSID',1);
+INSERT INTO sitevariables VALUES ('elabinelab/ops_osid',NULL,'','Default (emulab-ops) OSID to boot on ops node. Empty string means use node_type default OSID',1);
+INSERT INTO sitevariables VALUES ('elabinelab/fs_osid',NULL,'','Default (emulab-ops) OSID to boot on fs node. Empty string means use node_type default OSID',1);
 INSERT INTO sitevariables VALUES ('general/firstinit/state',NULL,'Ready','Indicates that a new emulab is not setup yet. Moves through several states.',0);
 INSERT INTO sitevariables VALUES ('general/firstinit/pid',NULL,'testbed','The Project Name of the first project.',0);
 INSERT INTO sitevariables VALUES ('general/version/minor','168','','Source code minor revision number',0);
@@ -72,7 +72,7 @@ INSERT INTO sitevariables VALUES ('general/version/build','12/22/2009','','Build
 INSERT INTO sitevariables VALUES ('general/version/major','4','','Source code major revision number',0);
 INSERT INTO sitevariables VALUES ('general/mailman/password','MessyBoy','','Admin password for Emulab generated lists',0);
 INSERT INTO sitevariables VALUES ('swap/swapout_command_failaction',NULL,'warn','What to do if swapout command fails (warn == continue, fail == fail swapout).',0);
-INSERT INTO sitevariables VALUES ('general/open_showexplist',NULL,'','Allow members of this experiment to view all running experiments on the experiment list page',0);
+INSERT INTO sitevariables VALUES ('general/open_showexplist',NULL,'','Allow members of this project to view all running experiments on the experiment list page',0);
 INSERT INTO sitevariables VALUES ('general/linux_endnodeshaping',NULL,'1','Use this sitevar to disable endnodeshaping on linux globally on your testbed',0);
 INSERT INTO sitevariables VALUES ('swap/swapout_command','/usr/local/bin/create-swapimage -s','','Command to run in admin MFS on each node of an experiment at swapout time. Runs as swapout user.',0);
 INSERT INTO sitevariables VALUES ('swap/swapout_command_timeout','360','120','Time (in seconds) to allow for command completion',0);

sql/updates/4/221

+#
+# Add sitevariables for OML support (that someone forgot).
+#
+use strict;
+use libdb;
+
+sub DoUpdate($$$)
+{
+    my ($dbhandle, $dbname, $version) = @_;
+
+    DBQueryFatal("INSERT INTO sitevariables VALUES (".
+		 "'oml/default_osid',NULL,'',".
+		 "'Default OSID to use for OML server',1)")
+	if (!TBSiteVarExists("oml/default_osid"));
+    DBQueryFatal("INSERT INTO sitevariables VALUES (".
+		 "'oml/default_server_startcmd',NULL,'',".
+		 "'Default command line to use to start OML server',1)")
+	if (!TBSiteVarExists("oml/default_server_startcmd"));
+
+    return 0;
+}
+1;