xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-26 08:55:24 +00:00
Code Issues Releases Wiki Activity

fix some bug found by cheng long

Browse Source
This commit is contained in:
huweihua
2015-11-27 03:47:48 -05:00
parent cac6a5c8af
commit a04f074c08
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xCAT-server/lib/xcat/plugins/getadapter.pm
View File

@@ -229,8 +229,10 @@ sub scan_adapters{
my $node;
foreach $node (@targetscannodes){
if ( -e "$inforootdir/$node.info"){
rename("$inforootdir/$node.infoi", "$inforootdir/$node.info.bak");
rename("$inforootdir/$node.info", "$inforootdir/$node.info.bak");
xCAT::MsgUtils->trace($VERBOSE,"d","getadapters: move $inforootdir/$node.info to $inforootdir/$node.info.bak");
}else{
open OUT,">$inforootdir/$node.first"
}
}
@@ -394,8 +396,11 @@ sub get_info_from_local{
}elsif( ! -e "$inforootdir/$node.info" && -e "$inforootdir/$node.info.bak" ){
rename("$inforootdir/$node.info.bak","$inforootdir/$node.info");
push @{$rsp->{data}}, "[$node] Scan failed but old data exist, using the old data:";
}elsif( -e "$inforootdir/$node.info" && ! -e "$inforootdir/$node.info.bak" ){
}elsif( -e "$inforootdir/$node.info" && ! -e "$inforootdir/$node.info.bak" && ! -e "$inforootdir/$node.first"){
push @{$rsp->{data}}, "[$node] with no need for scan due to old data exist, using the old data:";
}elsif(-e "$inforootdir/$node.info" && ! -e "$inforootdir/$node.info.bak" && -e "$inforootdir/$node.first"){
unlink "$inforootdir/$node.first";
push @{$rsp->{data}}, "[$node] scan successfully, below are the latest data:";
}else{
unlink "$inforootdir/$node.info.bak";
push @{$rsp->{data}}, "[$node] scan successfully, below are the latest data:";