Merge branch '2.8' of ssh://git.code.sf.net/p/xcat/xcat-core into 2.8

perl-xCAT/xCAT/Schema.pm

@@ -1476,7 +1476,7 @@ mic => {
         bridge => 'The virtual bridge on the host node which the mic connected to.',
         onboot => 'Set mic to autoboot when mpss start. Valid values: yes|no. Default is yes.',
         vlog => 'Set the Verbose Log to console. Valid values: yes|no. Default is no.',
-        powermgt => 'Set the Power Management for mic node. The value must be the [cpufreq=<on | off>]![corec6=<on | off>]![pc3=<on | off>]![pc6=<on | off>].',
+        powermgt => 'Set the Power Management for mic node. This attribute is used to set the power management state that mic may get into when it is idle. Four states can be set: cpufreq, corec6, pc3 and pc6. The valid value for powermgt attribute should be [cpufreq=<on|off>]![corec6=<on|off>]![pc3=<on|off>]![pc6=<on|off>]. e.g. cpufreq=on!corec6=off!pc3=on!pc6=off. Refer to the doc of mic to get more information for power management.',
         comments => 'Any user-provided notes.',
         disable => "Do not use.  tabprune will not work if set to yes or 1",
     },

xCAT-client/pods/man1/rinv.1.pod

@@ -112,15 +112,15 @@ Diagnostics information of firmware.
 
 =item B<mprom>
 
-?
+Retrieves mprom firmware level
 
 =item B<deviceid>
 
-?
+Retrieves device identification. Usually device, manufacturing and product ids. 
 
 =item B<guid>
 
-?
+Retrieves the global unique identifier 
 
 =item B<all>
 

xCAT-client/pods/man1/rvitals.1.pod

@@ -24,7 +24,7 @@ B<rvitals> I<noderange> {B<temp>|B<wattage>|B<fanspeed>|B<leds>|B<summary>|B<all
 
 =head2 BMC specific:
 
-B<rvitals> I<noderange> {B<temp>|B<voltage>|B<wattage>|B<fanspeed>|B<power>|B<leds>|B<lcds>|B<summary>|B<all>}
+B<rvitals> I<noderange> {B<temp>|B<voltage>|B<wattage>|B<fanspeed>|B<power>|B<leds>|B<all>}
 
 =head1 B<Description>
 

xCAT-server/lib/xcat/plugins/ipmi.pm

@@ -1724,6 +1724,10 @@ sub inv {
         $sessdata->{skipotherfru}=1;
 		@types = qw(asset);
 	}
+	elsif($subcommand eq "firm" || $subcommand eq "firmware") {
+        $sessdata->{skipotherfru}=1;
+		@types = qw(firmware);
+	}
 	elsif($subcommand eq "model") {
         $sessdata->{skipotherfru}=1;
 		@types = qw(model);
@@ -4479,7 +4483,7 @@ sub ieminitted {
 sub readenergy {
     my $sessdata = shift;
     unless ($iem_support) { 
-        xCAT::SvrUtils::sendmsg([1,"IBM::EnergyManager package required for this value"],$callback,$sessdata->{node},%allerrornodes);
+        xCAT::SvrUtils::sendmsg([1,":IBM::EnergyManager package required for this value"],$callback,$sessdata->{node},%allerrornodes);
         return;
     }
     my @entries;
@@ -4854,7 +4858,7 @@ sub renergy {
     my $sessdata = shift;
     my @subcommands = @{$sessdata->{extraargs}};
     unless ($iem_support) {
-        xCAT::SvrUtils::sendmsg("Command unsupported without IBM::EnergyManager installed",$callback,$sessdata->{node});
+        xCAT::SvrUtils::sendmsg(":Command unsupported without IBM::EnergyManager installed",$callback,$sessdata->{node});
         return;
     }
     my @directives=();
@@ -5036,7 +5040,7 @@ sub vitals {
         if ($iem_support) {
             push @{$sessdata->{sensorstoread}},"energy";
         } elsif (not $doall) {
-            xCAT::SvrUtils::sendmsg([1,"Energy data requires additional IBM::EnergyManager plugin in conjunction with IMM managed IBM equipment"],$callback,$sessdata->{node},%allerrornodes);
+            xCAT::SvrUtils::sendmsg([1,":Energy data requires additional IBM::EnergyManager plugin in conjunction with IMM managed IBM equipment"],$callback,$sessdata->{node},%allerrornodes);
         }
         #my @energies;
         #($rc,@energies)=readenergy();
@@ -6336,7 +6340,6 @@ sub preprocess_request {
           return 0;
       }
   }
-
   if (!$realnoderange) {
     $usage_string=xCAT::Usage->getUsage($command);
     $callback->({data=>$usage_string});