Commit e4caadb3 authored by Jonathon Duerig's avatar Jonathon Duerig

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

parents 81fc6c0f f2841c4f
......@@ -327,6 +327,7 @@ sub CreateSliver($)
if (defined($slice)) {
GeniCM::CleanupDeadSlice($slice, 1);
}
return $response;
}
my ($sliver_credential, $sliver_manifest) = @{ $response->{'value'} };
......
......@@ -935,7 +935,7 @@ sub ProcessManifest($$)
foreach my $ref (GeniXML::FindNodes("n:node",
$manifest)->get_nodelist()) {
my $sliver_urn = GeniXML::GetText("sliver_urn", $ref);
if (defined($sliver_urn) && $sliver_urn eq $self->urn()) {
if (defined($sliver_urn) && $sliver_urn eq $self->sliver_urn()) {
# startup command.
my $startupcmd = GeniXML::GetText("startup_command", $ref);
if (defined($startupcmd)) {
......
This diff is collapsed.
......@@ -309,7 +309,7 @@ handle_loadinfo()
zapsuperblocks /dev/$DISK
fi
write_image $ADDRESS /dev/$DISK $PARTITION $ZFILL $PTYPE $SERVER
write_image "$ADDRESS" "/dev/$DISK" "$PARTITION" "$ZFILL" "$PTYPE" "$SERVER"
rc=$?
if [ $rc -ne 0 ]; then
echo "Failed to write image to disk, status $rc"
......
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