From 8707039812bef374176ae70f9ca1e720cc96c911 Mon Sep 17 00:00:00 2001
From: phamt <phamt@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 6 Feb 2013 04:20:13 +0000
Subject: [PATCH] Fixed man page for rinv.  Fixed SSI query.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15074 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-client/pods/man1/rinv.1.pod    | 2 +-
 xCAT-server/lib/xcat/plugins/zvm.pm | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/xCAT-client/pods/man1/rinv.1.pod b/xCAT-client/pods/man1/rinv.1.pod
index b2c7d94ce..ceef75b38 100644
--- a/xCAT-client/pods/man1/rinv.1.pod
+++ b/xCAT-client/pods/man1/rinv.1.pod
@@ -172,7 +172,7 @@ Obtain the SSI and system status.
 
 =item B<--smapilevel>
 
-Obtain the SMAPI level installed on a given hypervisor.
+Obtain the SMAPI level installed on the z/VM system.
 
 =item B<--wwpn>
 
diff --git a/xCAT-server/lib/xcat/plugins/zvm.pm b/xCAT-server/lib/xcat/plugins/zvm.pm
index dd87324d4..4062375cc 100644
--- a/xCAT-server/lib/xcat/plugins/zvm.pm
+++ b/xCAT-server/lib/xcat/plugins/zvm.pm
@@ -841,6 +841,11 @@ sub changeVM {
         my $blks    = $args->[3];
         my $mode    = $args->[4];
         
+        # If the user specifies auto as the device address, then find a free device address
+        if ($addr eq "auto") {
+            $addr = xCAT::zvmUtils->getFreeAddress($::SUDOER, $node, "smapi");
+        }
+        
         my $readPw  = "''";
         if ($args->[5]) {
             $readPw = $args->[5];
@@ -1269,7 +1274,7 @@ sub changeVM {
         $out = xCAT::zvmUtils->appendHostname( $node, $out );
     }
 
-    # connectnic2vswitch [address] [VSwitch]
+    # connectnic2vswitch [address] [vSwitch]
     elsif ( $args->[0] eq "--connectnic2vswitch" ) {
         my $addr    = $args->[1];
         my $vswitch = $args->[2];
@@ -6636,7 +6641,7 @@ sub inventoryHypervisor {
     
     # ssi
     elsif ( $args->[0] eq "--ssi" ) {      
-        $str = `ssh $::SUDOER\@$hcp "$::SUDO $::DIR/smcli SSI_Query -T $hcpUserId"`;
+        $str = `ssh $::SUDOER\@$hcp "$::SUDO $::DIR/smcli SSI_Query"`;
     }
     
     # smapilevel