From 09172bd3228140e4926e4370cf1d8c4febc1a2de Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Tue, 9 Feb 2010 22:25:08 +0000 Subject: [PATCH] -Fix 'type' field of DIMM inventory to make 'rinv dimm' work correctly in ipmi world git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5205 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/ipmi.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm index 5b52b7a49..93fd6ade1 100644 --- a/xCAT-server/lib/xcat/plugins/ipmi.pm +++ b/xCAT-server/lib/xcat/plugins/ipmi.pm @@ -1380,20 +1380,20 @@ sub add_textual_frus { my $type = shift; my $sessdata = shift; unless ($type) { $type = 'hw'; } - add_textual_fru($parsedfru,$desc." ".$categorydesc."Part Number",$category,"partnumber","hw",$sessdata); - add_textual_fru($parsedfru,$desc." ".$categorydesc."Manufacturer",$category,"manufacturer","hw",$sessdata); - add_textual_fru($parsedfru,$desc." ".$categorydesc."Serial Number",$category,"serialnumber","hw",$sessdata); - add_textual_fru($parsedfru,$desc." ".$categorydesc."",$category,"name","hw",$sessdata); + add_textual_fru($parsedfru,$desc." ".$categorydesc."Part Number",$category,"partnumber",$type,$sessdata); + add_textual_fru($parsedfru,$desc." ".$categorydesc."Manufacturer",$category,"manufacturer",$type,$sessdata); + add_textual_fru($parsedfru,$desc." ".$categorydesc."Serial Number",$category,"serialnumber",$type,$sessdata); + add_textual_fru($parsedfru,$desc." ".$categorydesc."",$category,"name",$type,$sessdata); if ($parsedfru->{$category}->{builddate}) { - add_textual_fru($parsedfru,$desc." ".$categorydesc."Manufacture Date",$category,"builddate","hw",$sessdata); + add_textual_fru($parsedfru,$desc." ".$categorydesc."Manufacture Date",$category,"builddate",$type,$sessdata); } if ($parsedfru->{$category}->{buildlocation}) { - add_textual_fru($parsedfru,$desc." ".$categorydesc."Manufacture Location",$category,"buildlocation","hw",$sessdata); + add_textual_fru($parsedfru,$desc." ".$categorydesc."Manufacture Location",$category,"buildlocation",$type,$sessdata); } if ($parsedfru->{$category}->{model}) { - add_textual_fru($parsedfru,$desc." ".$categorydesc."Model",$category,"model","hw",$sessdata); + add_textual_fru($parsedfru,$desc." ".$categorydesc."Model",$category,"model",$type,$sessdata); } - add_textual_fru($parsedfru,$desc." ".$categorydesc."Additional Info",$category,"extra","hw",$sessdata); + add_textual_fru($parsedfru,$desc." ".$categorydesc."Additional Info",$category,"extra",$type,$sessdata); } sub initfru {