Merge pull request #990 from zet809/fix_rinv_issue_for_garrison

Enhance rinv for OpenPower Servers
xcat2 · Apr 29, 2016 · ae5ce53 · ae5ce53
2 parents 8bdfc11 + 300dabc
commit ae5ce53
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -3396,10 +3396,15 @@ sub readcurrfrudevice {
         }
         my @data = @{$rsp->{data}};
         if ($data[0] != $sessdata->{currfruchunk}) {
-            add_fruhash($sessdata);
-            my $text = "Received incorrect data from BMC for FRU ID: " . $sessdata->{currfruid};
-            xCAT::SvrUtils::sendmsg($text,$callback,$sessdata->{node},%allerrornodes);
-            return;
+            # Fix FRU 43,48 and 49 for GRS server that they can not return as much data as shall return
+            if ($data[0] gt 0) {
+                $sessdata->{currfrudone}=1;
+            } else {
+                my $text = "Received incorrect data from BMC for FRU ID: " . $sessdata->{currfruid};
+                xCAT::SvrUtils::sendmsg($text,$callback,$sessdata->{node},%allerrornodes);
+                add_fruhash($sessdata);
+                return;
+            }
         }
         shift @data;
         push @{$sessdata->{currfrudata}},@data;