Commit 68465808 authored by Leigh B Stoller's avatar Leigh B Stoller

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

parents c2a08261 a29732e8
......@@ -464,12 +464,11 @@ elsif (! $isadmin) {
#
UserError("Node Types: Must have at least one node type")
if ($#mtypes_array < 0);
my $typeclause = join(" or ", map("type='$_'", @mtypes_array));
# Check validity of mtype_* args, since the keys are dynamically generated.
my $node_types_selected = 0;
my @mtype_keys = grep(/^mtype_/, keys(%newimageid_args));
foreach $key (@mtype_keys) {
my @mtype_keys = ();
foreach $key (grep(/^mtype_/, keys(%newimageid_args))) {
my $value = $newimageid_args{$key};
print STDERR "mtype: '$key' -> '$value'\n"
if ($debug);
......@@ -482,11 +481,14 @@ foreach $key (@mtype_keys) {
}
elsif ($value eq "1") {
$node_types_selected++;
push(@mtype_keys, $key);
}
}
UserError("Node Types: Must select at least one node type")
if ($node_types_selected == 0 && !$force);
my $typeclause = join(" or ", map("type='$_'", @mtype_keys));
#
# Check sanity of node name and that user can create an image from it.
#
......
......@@ -928,7 +928,7 @@ char *usagestr =
void
usage()
{
fprintf(stderr, usagestr);
fprintf(stderr, "%s", usagestr);
exit(1);
}
......
......@@ -2,7 +2,7 @@
#
# EMULAB-LGPL
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# Copyright (c) 2004-2009 Regents, University of California.
# All rights reserved.
#
......@@ -1032,7 +1032,7 @@ sub removeSomePortsFromVlan($$@) {
$self->debug("$id $vlan_number: @portlist\n",2);
foreach my $portIndex (@portlist) {
next unless $porthash{$portIndex};
next unless exists($porthash{$portIndex});
if (@{@$vLists[1]}[$portIndex - 1]) {
# otherwise, port is tagged, or dual; maybe should complain.
......
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2008 University of Utah and the Flux Group.
# Copyright (c) 2004-2010 University of Utah and the Flux Group.
# All rights reserved.
#
use English;
......@@ -136,7 +136,7 @@ sub doboot()
system("$LAGENT -v -e $pid/$eid -s $server -l $LOGFILE ".
"-i $PIDFILE -k " . TMEVENTKEY() . "$args\n");
if ($?) {
fatal("Could not start program agent!");
fatal("Could not start link agent!");
}
return;
}
......
......@@ -1122,7 +1122,7 @@ sub vz_vnodePreConfigControlNetwork {
close(FD);
open(FD,">$mybootdir/bossip")
or die "vz_vnodePreConfigControlNetwork: could not open bossip for $vnode_id: $!";
print FD "$vnode_id\n";
print FD "$bossip\n";
close(FD);
#
......
......@@ -360,7 +360,7 @@ struct command {
{ "programs", FULLCONFIG_ALL, F_ALLOCATED, doprogagents},
{ "syncserver", FULLCONFIG_ALL, F_ALLOCATED, dosyncserver},
{ "keyhash", FULLCONFIG_ALL, F_ALLOCATED|F_REMREQSSL, dokeyhash},
{ "eventkey", FULLCONFIG_ALL, F_ALLOCATED, doeventkey},
{ "eventkey", FULLCONFIG_ALL, F_ALLOCATED|F_REMREQSSL, doeventkey},
{ "fullconfig", FULLCONFIG_NONE, F_ALLOCATED, dofullconfig},
{ "routelist", FULLCONFIG_PHYS, F_ALLOCATED, doroutelist},
{ "role", FULLCONFIG_PHYS, F_ALLOCATED, dorole},
......@@ -3866,13 +3866,11 @@ COMMAND_PROTOTYPE(doloadinfo)
return 1;
}
if ((nrows = (int)mysql_num_rows(res)) == 0) {
mysql_free_result(res);
return 0;
}
if (nrows > 1 && vers <= 29) {
bufp += OUTPUT(bufp, ebufp - bufp,
......@@ -5974,6 +5972,12 @@ COMMAND_PROTOTYPE(dofullconfig)
*/
continue;
}
/*
* Silently drop all TPM-required commands right now.
*/
if ((command_array[i].flags & F_REQTPM)) {
continue;
}
OUTPUT(buf, sizeof(buf),
"*** %s\n", command_array[i].cmdname);
client_writeback(sock, buf, strlen(buf), tcp);
......
<!--
EMULAB-COPYRIGHT
Copyright (c) 2000-2009 University of Utah and the Flux Group.
Copyright (c) 2000-2010 University of Utah and the Flux Group.
All rights reserved.
-->
<!-- Nothing here is published by ACM et al; no need to include this yet.
......@@ -154,7 +154,7 @@
Eric Eide, Leigh Stoller, and Jay Lepreau.
Flux Technical Note FTN&ndash;2006&ndash;03, University of Utah,
December&nbsp;2006.
Revised version version appears in NSDI&nbsp;2007
Revised version appears in NSDI&nbsp;2007
(linked above); please read and cite that paper instead.
<p>
......@@ -198,7 +198,7 @@
Jonathon Duerig, Robert Ricci, John Byers, and Jay Lepreau.
Flux Technical Note FTN&ndash;2006&ndash;02, University of Utah,
February&nbsp;2006.
Supercedes
Supersedes
<a href="http://www.cs.utah.edu/flux/papers/ipassign-ftn2005-04-base.html">FTN&ndash;2005&ndash;04</a>.
<p>
......@@ -264,7 +264,7 @@ Robert Ricci's talk at the INFORMS Annual Meeting, San Francisco, CA, November,
Jonathon Duerig, Robert Ricci, John Byers, and Jay Lepreau.
Flux Technical Note FTN&ndash;2005&ndash;04, University of Utah,
July&nbsp;2005.
Superceded by
Superseded by
<a href="http://www.cs.utah.edu/flux/papers/ipassign-ftn2006-02-base.html">FTN&ndash;2006&ndash;02</a>.
<p>
......@@ -319,7 +319,7 @@ Robert Ricci's talk at the INFORMS Annual Meeting, San Francisco, CA, November,
<li> <cite><a href="http://www.cs.utah.edu/flux/papers/frisbee-usenix03-base.html">
Fast, Scalable Disk Imaging with Frisbee</a></cite>,
Mike Hibler, Leigh Stoller, Jay Lepreau, Robert Ricci, Chad Barb.
In Proceeeding of the
In Proceedings of the
<a href='http://www.usenix.org/events/usenix03/'>2003 USENIX Annual Technical Conference</a>,
June 2003.
The <a href = "http://www.emulab.net/software.php3">Frisbee software</a> is open source and available.
......@@ -344,7 +344,7 @@ Robert Ricci's talk at the INFORMS Annual Meeting, San Francisco, CA, November,
An Integrated Experimental Environment for Distributed Systems and Networks</a></cite>,
by White, Lepreau, Stoller, Ricci, Guruprasad, Newbold, Hibler, Barb, and Joglekar,
appeared at <a href = "http://www.usenix.org/events/osdi02/">OSDI 2002</a>, December 2002.<br>
<b><a href="http://www.cs.utah.edu/flux/papers/netbed-osdi02.bib">BibTex entry you should use to cite Netbed/Emulab</a></b>
<b><a href="http://www.cs.utah.edu/flux/papers/netbed-osdi02.bib">BibTeX entry you should use to cite Netbed/Emulab</a></b>
<p>
<li> <cite><a href="http://www.cs.utah.edu/flux/papers/barrier-hotnets1-base.html">
......@@ -356,7 +356,7 @@ Robert Ricci's talk at the INFORMS Annual Meeting, San Francisco, CA, November,
<p>
<li> <cite>Netbed: An Integrated Experimental Environment</cite>,
White et al; SIGCOMM 2002 Poster Abstract, August 2002.
White et al.; SIGCOMM 2002 Poster Abstract, August 2002.
(<a href="http://www.cs.utah.edu/flux/papers/netbed-sigcomm02/posterabs.pdf">PDF</a>,
<a href="http://www.cs.utah.edu/flux/papers/netbed-sigcomm02/posterabs.ps">Postscript</a>)
<p>
......@@ -364,7 +364,7 @@ Robert Ricci's talk at the INFORMS Annual Meeting, San Francisco, CA, November,
<li> <b>SOSP'01 Poster, November 2001.</b>
(<a href="http://www.cs.utah.edu/flux/testbed-docs/sosp01-poster/testbed-sosp-final-white.htm">HTML</a>,
<a href="http://www.cs.utah.edu/flux/testbed-docs/sosp01-poster/sosp-final-white.ps">Postscript</a>,
<a href="http://www.cs.utah.edu/flux/testbed-docs/sosp01-poster/testbed-sosp-final-white.ppt">Powerpoint</a>)
<a href="http://www.cs.utah.edu/flux/testbed-docs/sosp01-poster/testbed-sosp-final-white.ppt">PowerPoint</a>)
<p>
<li> <a href = "http://www.cs.utah.edu/flux/testbed-docs/glossy.pdf">
......@@ -378,14 +378,14 @@ Robert Ricci's talk at the INFORMS Annual Meeting, San Francisco, CA, November,
<li> <b>emulab.net: An Emulation Testbed for Networks and Distributed Systems</b>,
full presentation at Intel, June 2001.
(<a href="http://www.cs.utah.edu/flux/testbed-docs/testbed-intel-jun01.htm">HTML</a>,
<a href="http://www.cs.utah.edu/flux/testbed-docs/testbed-intel-jun01.ppt">Powerpoint</a>)
<a href="http://www.cs.utah.edu/flux/testbed-docs/testbed-intel-jun01.ppt">PowerPoint</a>)
<p>
<li> Utah CHPC Cluster workshop talk,
February 2000,
with lots of goofy pictures,
in <a href="http://www.cs.utah.edu/flux/testbed-docs/testbed-chpc.ppt">
Powerpoint</a> and
PowerPoint</a> and
<a href="http://www.cs.utah.edu/flux/testbed-docs/testbed-chpc/index.htm">
HTML</a> formats.
<p>
......@@ -393,7 +393,7 @@ Robert Ricci's talk at the INFORMS Annual Meeting, San Francisco, CA, November,
<li> SOSP'99 Work-in-progress talk,
December 1999,
in <a href="http://www.cs.utah.edu/flux/testbed-docs/sosp99-wip.ppt">
Powerpoint</a> and
PowerPoint</a> and
<a href="http://www.cs.utah.edu/flux/testbed-docs/sosp99-wip/index.htm">
HTML</a> formats.
<p>
......@@ -401,7 +401,7 @@ Robert Ricci's talk at the INFORMS Annual Meeting, San Francisco, CA, November,
<li> SIGCOMM'99 New Research Session,
September 1999,
in <a href="http://www.cs.utah.edu/flux/testbed-docs/sigcomm99-wip.ppt">
Powerpoint</a> and
PowerPoint</a> and
<a href="http://www.cs.utah.edu/flux/testbed-docs/sigcomm99-wip/index.htm">
HTML</a> formats.
</ul>
Markdown is supported
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