From 9d242b3730f9254a3e38c81958bb49ae3cce20c2 Mon Sep 17 00:00:00 2001 From: zhaoertao Date: Tue, 19 Jul 2011 06:15:50 +0000 Subject: [PATCH] fix bugs 3367500 part 1: 'hwtype' element position not correct git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10112 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/FSPscan.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/perl-xCAT/xCAT/FSPscan.pm b/perl-xCAT/xCAT/FSPscan.pm index f3496c698..0e5c4dcaa 100644 --- a/perl-xCAT/xCAT/FSPscan.pm +++ b/perl-xCAT/xCAT/FSPscan.pm @@ -27,7 +27,7 @@ my @header = ( ["side", "%-8s" ], ["address", "%-20s\n" ]); -my @attribs = qw(nodetype hwtype node id mtm serial side hcp pprofile parent groups mgt cons); +my @attribs = qw(nodetype node id mtm serial side hcp pprofile parent groups mgt cons hwtype); my %globalnodetype = ( fsp => $::NODETYPE_PPC, bpa => $::NODETYPE_PPC, @@ -173,7 +173,7 @@ sub enumerate { $side=""; } push @values, join( ",", - $$d[4],$node_name,$cageid,$model,$serial,$side, $server,$prof,$fname, $ips); + $$d[4],$node_name,$cageid,$model,$serial,$side, $server,$prof,$fname, $ips, $$d[4]); # $$d[4],$node_name,$cageid,$model,$serial,$side, $server,$prof,$fname, $7); # "fsp",$node_name,$cageid,$model,$serial,$side, $server,$prof,$fname, $7); #"fsp",$fsp,$cageid,$model,$serial,$side,$server,$prof,$fname,$ips ); @@ -211,7 +211,7 @@ sub enumerate { # Save LPAR information ##################################### push @values, join( ",", - "lpar",$name,$lparid,$model,$serial,$port,$server,$prof,$fsp,$ips ); + "lpar",$name,$lparid,$model,$serial,$port,$server,$prof,$fsp,$ips,"lpar" ); }