Commit 5d7c4223 authored by Leigh B Stoller's avatar Leigh B Stoller

Minor bug fix.

parent 73ec9193
......@@ -41,7 +41,7 @@ sub Install($$$)
Phase "nodetype", "Creating Protogeni nodetype", sub {
my $nodetype = NodeType->Lookup($NODETYPE);
PhaseSkip("already created")
if (defined($NODETYPE));
if (defined($nodetype));
ExecQuietFatal("$SUDO -u $PROTOUSER ".
" $WAP $CREATETYPE $NODETYPEXML");
};
......@@ -69,6 +69,20 @@ sub Install($$$)
DoneIfExists($localfile);
FetchFileFatal($url, $localfile);
};
$localfile = "$PREFIX/images/${imagename}.xml";
$url = "$STDIMAGESURL/${imagename}.xml";
Phase "${imagename}_xml", "Fetching $imagename metadata", sub {
DoneIfExists($localfile);
FetchFileFatal($url, $localfile);
};
Phase "${imagename}_load", "Loading the image descriptor.", sub {
ExecQuietFatal("cd $TOP_OBJDIR/install; ".
" $SUDO -u $PROTOUSER $WAP ".
" perl load-descriptors -a $localfile");
};
}
foreach my $mbr (@MBRS) {
my $localfile = "$PREFIX/images/$mbr";
......
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