Commit 1efb3ee4 authored by Leigh B. Stoller's avatar Leigh B. Stoller

ElabinElab change: small org change to deal with images that do not

exist; fire up frisbeelauncher early to see if it can get the image.
This is harmless in that frisbeelauncher can be called multiple times
anyway, so when its called is not really a big deal.
parent 25670e39
......@@ -28,6 +28,7 @@ use IO::Handle;
my $TB = "@prefix@";
my $TESTMODE = @TESTMODE@;
my $TBOPS = "@TBOPSEMAIL@";
my $ELABINELAB = @ELABINELAB@;
# Max number of retries (per node) before its deemed fatal. This allows
# for the occasional pxeboot failure.
......@@ -194,10 +195,25 @@ sub osload ($$) {
goto failednode;
}
if (! -R $imagepath) {
print STDERR
"*** osload ($node): ".
"$imagepath does not exists or cannot be read!\n";
goto failednode;
if ($ELABINELAB) {
#
# Yuck. See if we can get it via frisbeelauncher before
# giving up.
#
system("$FRISBEELAUNCHER " . ($debug ? "-d ": "") . "$imageid");
if ($?) {
print STDERR
"*** osload ($node): ".
"Frisbee Launcher ($imageid) failed!\n";
goto failednode;
}
}
else {
print STDERR
"*** osload ($node): ".
"$imagepath does not exists or cannot be read!\n";
goto failednode;
}
}
#
......
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