From 7633449ab2f0abd9a507b3600f9ccd597650dedd Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 30 Nov 2011 20:37:57 +0000
Subject: [PATCH] Fix format of varius rinv output

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11090 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/ipmi.pm | 34 +++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 098baf857..6e81418c0 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -2180,9 +2180,9 @@ sub add_fruhash {
         if ($sessdata->{currfrutype} and $sessdata->{currfrutype} eq 'dimm') {
             add_textual_frus($fruhash,$sessdata->{currfrusdr}->id_string,"","product","dimm,hw",$sessdata);
         } else {
-            add_textual_frus($fruhash,$sessdata->{currfrusdr}->id_string,"Board","board",undef,$sessdata);
-            add_textual_frus($fruhash,$sessdata->{currfrusdr}->id_string,"Product","product",undef,$sessdata);
-            add_textual_frus($fruhash,$sessdata->{currfrusdr}->id_string,"Chassis","chassis",undef,$sessdata);
+            add_textual_frus($fruhash,$sessdata->{currfrusdr}->id_string,"Board ","board",undef,$sessdata);
+            add_textual_frus($fruhash,$sessdata->{currfrusdr}->id_string,"Product ","product",undef,$sessdata);
+            add_textual_frus($fruhash,$sessdata->{currfrusdr}->id_string,"Chassis ","chassis",undef,$sessdata);
         }
     }
     if (scalar @{$sessdata->{dimmfru}}) {
@@ -4513,6 +4513,34 @@ sub sensor_was_read {
             if ($exdata1 & 1<<3) {
                 push @exparts,"Power Cycle";
             }
+        } elsif ($sdr->sensor_type == 0xd) {
+            if ($exdata1 & 1) {
+                push @exparts,"Present";
+            }
+            if ($exdata1 & 1<<1) {
+                push @exparts,"Fault";
+            }
+            if ($exdata1 & 1<<2) {
+                push @exparts,"Failure Predicted";
+            }
+            if ($exdata1 & 1<<3) {
+                push @exparts,"Hot Spare";
+            }
+            if ($exdata1 & 1<<4) {
+                push @exparts,"Consistency Check";
+            }
+            if ($exdata1 & 1<<5) {
+                push @exparts,"Critical Array";
+            }
+            if ($exdata1 & 1<<6) {
+                push @exparts,"Failed Array";
+            }
+            if ($exdata1 & 1<<7) {
+                push @exparts,"Rebuilding";
+            }
+            if ($exdata1 & 1<<8) {
+                push @exparts,"Rebuild aborted";
+            }
         } else {
             $extext = "xCAT needs to add support for ".$sdr->sensor_type;
         }