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

Fixed bug 3133969: getmacs/rneboot-> cannot handle error for rpower failure

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8473 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz
2010-12-20 09:14:15 +00:00
parent b8ebdb7b3b
commit 821ba4eae2
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
perl-xCAT/xCAT/FSPboot.pm
View File

@@ -144,7 +144,7 @@ sub do_rnetboot {
#######################################
foreach ( split /\n/, $result ) {
if ( /^lpar_netboot: / ) {
if ( /^lpar_netboot / ) {
$Rc = RC_ERROR;
last;
}
@@ -348,7 +348,7 @@ sub rnetboot {
#
##################################
if ( $Rc != SUCCESS ) {
if ( @$result[0] =~ /lpar_netboot: (.*)/ ) {
if ( @$result[0] =~ /lpar_netboot (.*)/ ) {
return( [[$node,$1,$Rc]] );
}
return( [[$node,join( '', @$result ),$Rc]] );
@@ -388,7 +388,7 @@ sub rnetboot {
# lpar_netboot: bootp operation failed.
#
#####################################
if ( $data =~ /lpar_netboot: (.*)/ ) {
if ( $data =~ /lpar_netboot (.*)/ ) {
return( [[$node,$1,RC_ERROR]] );
}
return( [[$node,$data,RC_ERROR]] );

4
perl-xCAT/xCAT/FSPmac.pm
View File

@@ -154,7 +154,7 @@ sub do_getmacs {
my $Rc = SUCCESS;
foreach ( split /\n/, $result ) {
if ( /^lpar_netboot: / ) {
if ( /^lpar_netboot / ) {
$Rc = RC_ERROR;
last;
}
@@ -499,7 +499,7 @@ sub getmacs {
# Return error
##################################
if ( $Rc != SUCCESS ) {
if ( @$result[0] =~ /lpar_netboot: (.*)/ ) {
if ( @$result[0] =~ /lpar_netboot (.*)/ ) {
return( [[$node,$1,$Rc]] );
}
return( [[$node,join( '', @$result ),$Rc]] );

6
perl-xCAT/xCAT/PPCboot.pm
View File

@@ -277,7 +277,7 @@ sub do_rnetboot {
#######################################
foreach ( split /\n/, $result ) {
if ( /^lpar_netboot: / ) {
if ( /^lpar_netboot / ) {
$Rc = RC_ERROR;
last;
}
@@ -495,7 +495,7 @@ sub rnetboot {
#
##################################
if ( $Rc != SUCCESS ) {
if ( @$result[0] =~ /lpar_netboot: (.*)/ ) {
if ( @$result[0] =~ /lpar_netboot (.*)/ ) {
return( [[$node,$1,$Rc]] );
}
return( [[$node,join( '', @$result ),$Rc]] );
@@ -535,7 +535,7 @@ sub rnetboot {
# lpar_netboot: bootp operation failed.
#
#####################################
if ( $data =~ /lpar_netboot: (.*)/ ) {
if ( $data =~ /lpar_netboot (.*)/ ) {
return( [[$node,$1,RC_ERROR]] );
}
return( [[$node,$data,RC_ERROR]] );

4
perl-xCAT/xCAT/PPCmac.pm
View File

@@ -367,7 +367,7 @@ sub do_getmacs {
my $Rc = SUCCESS;
foreach ( split /\n/, $result ) {
if ( /^lpar_netboot: / ) {
if ( /^lpar_netboot / ) {
$Rc = RC_ERROR;
last;
}
@@ -675,7 +675,7 @@ sub getmacs {
# Return error
##################################
if ( $Rc != SUCCESS ) {
if ( @$result[0] =~ /lpar_netboot: (.*)/ ) {
if ( @$result[0] =~ /lpar_netboot Status: (.*)/ ) {
return( [[$node,$1,$Rc]] );
}
return( [[$node,join( '', @$result ),$Rc]] );