Commit f4361cc1 authored by Leigh B. Stoller's avatar Leigh B. Stoller

* Make sure we capture STDERR.

* Do not exit from the cdboot, just return!
parent 52c43c52
......@@ -90,13 +90,14 @@ if ($action eq "boot" || $action eq "reconfig") {
print LOG $_;
print "$_";
}
close(FOO);
close(LOG);
close(FOO);
if ($?) {
BootFatal($? >> 8, "Boot Failure!");
}
exit(0);
}
open(STDERR, ">&STDOUT");
}
# Execute the action.
......
......@@ -99,12 +99,13 @@ if ($action eq "boot" || $action eq "reconfig") {
print LOG $_;
print "$_";
}
close(FOO);
close(LOG);
close(FOO);
# The CDROM *always* reports back what it can.
BootNotify($? >> 8, "CD Boot");
exit(0);
}
open(STDERR, ">&STDOUT");
}
# Execute the action.
......@@ -154,7 +155,7 @@ sub BootNotify($$)
print "Error sending TBFAILED to Emulab Control!\n";
}
exit(0)
return
if (!$code);
if (tmcc(TMCCCMD_STATE, "PXEFAILED") < 0) {
......
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