Commit a33945e0 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents be090242 19783e58
......@@ -150,7 +150,7 @@ sub osmap($$;$)
return undef;
}
# To avoid writting out all the methods.
# To avoid writing out all the methods.
sub AUTOLOAD {
my $self = shift;
my $type = ref($self) or die("$self is not an object\n");
......@@ -1185,6 +1185,7 @@ use base qw(libossetup_handler);
use libdb;
use libtestbed;
use libossetup;
use libosload;
use libtblog;
use Node;
use English;
......
......@@ -8009,7 +8009,7 @@ sub PrintSolution($$)
my $root = $doc->createElement("rspec");
$root->setAttribute("pid", "$pid");
$root->setAttribute("eid", "$eid");
$root->setAttribute("xmlns:rspec", "http://emulab.net/resources/rspec/0.1");
$root->setAttribute("xmlns:rspec", "http://www.protogeni.net/resources/rspec/0.1");
$doc->setDocumentElement($root);
foreach my $pnodename (keys(%{ $self->solution_p2v() })) {
......
......@@ -628,14 +628,14 @@ sub GenDefsFile($)
#
my %defvalues = (
"elabinelab/singlenet" => 0,
"elabinelab/boss_osid" => "FBSD63-STD",
"elabinelab/ops_osid" => "FBSD63-STD",
"elabinelab/fs_osid" => "FBSD63-STD"
"elabinelab/boss_osid" => "FBSD73-STD",
"elabinelab/ops_osid" => "FBSD73-STD",
"elabinelab/fs_osid" => "FBSD73-STD"
);
while (my ($var, $def) = each(%defvalues)) {
if (!exists($sitevars{$var})) {
print "*** WARNING: sitevar $var does not exist or has no value, ",
"defaulting to $def\n";
## don't be so alarmist
#print "*** WARNING: sitevar $var does not exist or has no value, defaulting to $def\n";
print TCL "set sitevariables($var) $def\n";
$sitevars{$var} = $def;
}
......
......@@ -92,7 +92,7 @@ echo "$ELABROUTES" | sed -e 's/;/\n/g' | \
_if=`echo "$route" | sed -r -e 's/([^,]*),[^,]*/\1/'`
_rt=`echo "$route" | sed -r -e 's/[^,]*,([^,]*)/\1/'`
if [ $_if == $DEV ]; then
if [ $_if = $DEV ]; then
echo "Emulab configuring route for CT$VEID: exp net ($_if)"
$ROUTE add -host $_rt dev $_if
fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment