From e9fe3ab33e034a6ddd5a80c2cb28f89790687be0 Mon Sep 17 00:00:00 2001
From: sakolish <sakolish@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 19 Jun 2008 19:27:26 +0000
Subject: [PATCH] Changed "rinv fw" to "rinv firm" to match blade command

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1705 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/PPCinv.pm | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/perl-xCAT/xCAT/PPCinv.pm b/perl-xCAT/xCAT/PPCinv.pm
index eae2c114d..055ac9cda 100644
--- a/perl-xCAT/xCAT/PPCinv.pm
+++ b/perl-xCAT/xCAT/PPCinv.pm
@@ -35,7 +35,7 @@ sub parse_args {
     my $command = $request->{command};
     my $args    = $request->{arg};
     my %opt     = ();
-    my @rinv    = qw(bus config model serial fw all);
+    my @rinv    = qw(bus config model serial firm all);
 
     #############################################
     # Responds with usage statement
@@ -392,7 +392,6 @@ sub vpd {
     if ( $cmds[0] eq "all" )  {
         @cmds = qw( model serial );
     }
-
     while (my ($mtms,$h) = each(%$hash) ) {
         #####################################
         # Get information for this CEC
@@ -463,9 +462,9 @@ sub firmware {
                     push @result, [$name,@$values[0],$Rc];
                     next;
                 }
-                push @result, [$name,"Activated Level = $1",$Rc]; 
-                push @result, [$name,"Permanent Level = $2",$Rc]; 
-                push @result, [$name,"Temporary Level = $3",$Rc]; 
+                push @result, [$name,"Activated Level: $1",$Rc]; 
+                push @result, [$name,"Permanent Level: $2",$Rc]; 
+                push @result, [$name,"Temporary Level: $3",$Rc]; 
                 next;
             }
             #####################################
@@ -473,7 +472,7 @@ sub firmware {
             #####################################
             foreach ( @licmap ) {  
                 if ( @$values[0] =~ /@$_[0]=(\w+)/ ) {
-                    push @result, [$name,"@$_[1] = $1",$Rc];
+                    push @result, [$name,"@$_[1]: $1",$Rc];
                 }
             }
         }
@@ -548,7 +547,7 @@ sub config {
 ##########################################################################
 # Returns firmware version 
 ##########################################################################
-sub fw {
+sub firm {
     return( firmware(@_) );
 }
 
@@ -566,7 +565,6 @@ sub model {
     return( vpd(@_) );
 }
 
-
 ##########################################################################
 # Returns all inventory information
 ##########################################################################