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

merge the prescript changes made in r9606 to 2.6 branch

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.6@9696 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao
2011-05-26 18:00:23 +00:00
parent 7bdd6e6368
commit 6e235884d9
5 changed files with 98 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-server/lib/xcat/plugins/aixinstall.pm
+42 -6
View File
@@ -638,7 +638,13 @@ sub nimnodeset
$subreq->({command=>['runbeginpre'],
node=>\@nodelist,
arg=>["standalone", '-l']},\&pass_along);
if ($errored) { return; }
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running begin prescripts.\n";
$callback->($rsp);
return 1;
}
#
@@ -1125,7 +1131,13 @@ sub nimnodeset
node=>\@nodelist,
arg=>["standalone", '-l']},\&pass_along);
}
if ($errored) { $retcode = 1; }
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running end prescripts.\n";
$callback->($rsp);
return 1;
}
return $retcode;
}
@@ -7807,7 +7819,13 @@ sub mkdsklsnode
$subreq->({command=>['runbeginpre'],
node=>\@nodelist,
arg=>["diskless", '-l']},\&pass_along);
if ($errored) { return; }
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running begin prescripts.\n";
$callback->($rsp);
return 1;
}
#
@@ -8674,7 +8692,13 @@ sub mkdsklsnode
node=>\@nodelist,
arg=>["diskless", '-l']},\&pass_along);
}
if ($errored) { $retcode = 1; }
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running end prescripts.\n";
$callback->($rsp);
return 1;
}
return $retcode;
@@ -9741,7 +9765,13 @@ sub rmdsklsnode
# to handles my own children
$errored=0;
$subreq->({command=>['runbeginpre'], node=>\@nodelist, arg=>["remove", '-l']},\&pass_along);
if ($errored) { return; }
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running begin prescripts.\n";
$callback->($rsp);
return 1;
}
# for each node
my @nodesfailed;
@@ -9916,7 +9946,13 @@ sub rmdsklsnode
node=>\@nodelist,
arg=>["remove", '-l']},\&pass_along);
}
if ($errored) { $retcode = 1; }
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running end prescripts.\n";
$callback->($rsp);
return 1;
}
return $retcode;
xCAT-server/lib/xcat/plugins/pxe.pm
+14 -2
View File
@@ -412,7 +412,13 @@ sub process_request {
node=>\@rnodes,
arg=>[$args[0]]},\&pass_along);
}
if ($errored) { return; }
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running begin prescripts\n";
$callback->($rsp);
return;
}
}
#end prescripts code
@@ -552,7 +558,13 @@ sub process_request {
node=>\@rnodes,
arg=>[$args[0]]},\&pass_along);
}
if ($errored) { return; }
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running end prescripts\n";
$callback->($rsp);
return;
}
}
xCAT-server/lib/xcat/plugins/vsmppxe.pm
+14 -2
View File
@@ -309,7 +309,13 @@ sub process_request {
node=>\@rnodes,
arg=>[$args[0]]},\&pass_along);
}
if ($errored) { return; }
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running begin prescripts\n";
$callback->($rsp);
return;
}
}
#end prescripts code
@@ -418,7 +424,13 @@ sub process_request {
node=>\@rnodes,
arg=>[$args[0]]},\&pass_along);
}
if ($errored) { return; }
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running end prescripts\n";
$callback->($rsp);
return;
}
}
}
xCAT-server/lib/xcat/plugins/xnba.pm
+14 -2
View File
@@ -453,7 +453,13 @@ sub process_request {
node=>\@rnodes,
arg=>[$args[0]]},\&pass_along);
}
if ($errored) { return; }
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running begin prescripts.\n";
$callback->($rsp);
return;
}
}
#back to normal business
@@ -551,7 +557,13 @@ sub process_request {
node=>\@rnodes,
arg=>[$args[0]]},\&pass_along);
}
if ($errored) { return; }
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running end prescripts.\n";
$callback->($rsp);
return;
}
}
}
xCAT-server/lib/xcat/plugins/yaboot.pm
+14 -2
View File
@@ -345,7 +345,13 @@ sub process_request {
node=>\@rnodes,
arg=>[$args[0]]},\&pass_along);
}
if ($errored) { return; }
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running begin prescripts.\n";
$callback->($rsp);
return;
}
}
#back to normal business
@@ -434,7 +440,13 @@ sub process_request {
node=>\@rnodes,
arg=>[$args[0]]},\&pass_along);
}
if ($errored) { return; }
if ($errored) {
my $rsp;
$rsp->{errorcode}->[0]=1;
$rsp->{error}->[0]="Failed in running end prescripts\n";
$callback->($rsp);
return;
}
}
}