arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

defect 3760

Browse Source
This commit is contained in:
lissav 2013-10-09 12:28:09 -04:00
parent e81fae18d1
commit 2a4a063169
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xCAT-server/lib/xcat/plugins/pxe.pm
View File

@ -129,7 +129,7 @@ sub setstate {
$kcmdlinehack =~ s/#TABLE:([^:#]+):([^:#]+):([^:#]+)#/$naval/;
} else {
my $msg = "Table key of $2 not yet supported by boottarget mini-template";
$callback->({
$::callback->({
error => ["$msg"],
errorcode => [1]
});
@ -148,7 +148,7 @@ sub setstate {
unless ($ipfn) {
my @myself = xCAT::NetworkUtils->determinehostname();
my $myname = $myself[(scalar @myself)-1];
$callback->(
$::callback->(
{
error => [
"$myname: Unable to determine or reasonably guess the image server for $node"
@ -357,6 +357,7 @@ sub process_request {
$request = shift;
$callback = shift;
my $sub_req = shift;
$::callback=$callback;
my @args;
my @nodes;
my @rnodes;

5
xCAT-server/lib/xcat/plugins/yaboot.pm
View File

@ -104,7 +104,7 @@ sub setstate {
if (xCAT::InstUtils->is_me($sn)) {
my @myself = xCAT::NetworkUtils->determinehostname();
my $myname = $myself[(scalar @myself)-1];
$callback->(
$::callback->(
{
error => [
"$myname: Unable to determine the image server for $node on service node $sn"
@ -116,7 +116,7 @@ sub setstate {
}
}
} else {
$callback->(
$::callback->(
{
error => [
"$myname: Unable to determine the image server for $node"
@ -409,6 +409,7 @@ sub process_request {
$request = shift;
$callback = shift;
$sub_req = shift;
$::callback=$callback;
my $command = $request->{command}->[0];
%breaknetbootnodes=();
%normalnodes=();