From 40d74e0b7e2ce5d72d09072332a00be48a3497ae Mon Sep 17 00:00:00 2001
From: ligc <ligc@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 4 Jun 2010 08:34:28 +0000
Subject: [PATCH] fix for NFSv4 support, in hiarachy env

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6350 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/aixinstall.pm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm
index 434bba5a3..a85c0dc1b 100644
--- a/xCAT-server/lib/xcat/plugins/aixinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm
@@ -6881,10 +6881,6 @@ sub mkdsklsnode
 
         # define the node
         my $defcmd = "/usr/sbin/nim -o define -t $type ";
-        if ($::NFSV4)
-        {
-            $defcmd .= "-a nfs_vers=4 ";
-        }
         if ($::NEWNAME)
         {
             $defcmd .= "-a if1='find_net $nodeshorthost 0' ";
@@ -7820,8 +7816,15 @@ sub make_SN_resource
                       dirname(dirname($lochash{$imghash{$image}{$restype}}));
                     chomp $loc;
 
-                    my $spotcmd =
-                      "/usr/lpp/bos.sysmgt/nim/methods/m_mkspot -o -a server=master -a location=$loc -a source=no $imghash{$image}{$restype}";
+                    my $spotcmd;
+                    if ($::NFSV4)
+                    { 
+                      $spotcmd = "/usr/lpp/bos.sysmgt/nim/methods/m_mkspot -o -a server=master -a location=$loc -a nfs_vers=4 -a source=no $imghash{$image}{$restype}";
+                    } 
+                    else
+                    {
+                        $spotcmd = "/usr/lpp/bos.sysmgt/nim/methods/m_mkspot -o -a server=master -a location=$loc -a source=no $imghash{$image}{$restype}"; 
+                    }
 
                     if ($::VERBOSE)
                     {