From 68d1067b9c8ca5de7ea80061cc97fdfc810d0c1e Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 4 Dec 2012 20:38:37 +0000
Subject: [PATCH] new logic to get xcataixpost to the node

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

diff --git a/xCAT-server/lib/xcat/plugins/updatenode.pm b/xCAT-server/lib/xcat/plugins/updatenode.pm
index b81d22ea4..7e7a77029 100644
--- a/xCAT-server/lib/xcat/plugins/updatenode.pm
+++ b/xCAT-server/lib/xcat/plugins/updatenode.pm
@@ -1178,24 +1178,23 @@ sub updatenoderunps
     my $tftpdir       = xCAT::TableUtils->getTftpDir();
     my $postscripts      = "";
     my $orig_postscripts = "";
+    # For AIX nodes check NFS
+    my $nfsv4;
+    my @nfsv4 =
+      xCAT::TableUtils->get_site_attribute("useNFSv4onAIX");
+      if ($nfsv4[0] && ($nfsv4[0] =~ /1|Yes|yes|YES|Y|y/)) {
+         $nfsv4 = "yes";
+      } else {
+         $nfsv4 = "no";
+      }
+        
 
-    if (($request->{postscripts}) && ($request->{postscripts}->[0]))
-    {
+      if (($request->{postscripts}) && ($request->{postscripts}->[0]))
+      {
         $orig_postscripts = $request->{postscripts}->[0];
-    }
-    # copy xcataixpost down for any AIX nodes
-    xCAT::Utils->runxcmd(
-                             {
-                              command => ['xdcp'],
-                              node    => \@$nodes,
-                              arg     => ['/install/postscripts/xcataixpost','/tmp/xcataixpost'],
-                             },
-                             $subreq, 0, 1
-                             );
-
+      }
         $postscripts = $orig_postscripts;
 
-        # we have Linux nodes
         my $cmd;
 
         # get server names as known by the nodes
@@ -1223,6 +1222,8 @@ sub updatenoderunps
                 $mode = "1";
             }
             my $args1;
+            # Note order of parameters to xcatdsklspost 
+            #is important and cannot be changed
             if ($::SETSERVER)
             {
                 $args1 = [
@@ -1230,7 +1231,7 @@ sub updatenoderunps
                     "-s",
                     "-v",
                     "-e",
-                    "$installdir/postscripts/xcatdsklspost $mode -M $snkey '$postscripts' --tftp $tftpdir"
+                    "$installdir/postscripts/xcatdsklspost $mode -M $snkey '$postscripts' --tftp $tftpdir --installdir $installdir --nfsv4 $nfsv4"
                     ];
 
             }
@@ -1242,7 +1243,7 @@ sub updatenoderunps
                     "-s",
                     "-v",
                     "-e",
-                    "$installdir/postscripts/xcatdsklspost $mode -m $snkey '$postscripts' --tftp $tftpdir"
+                    "$installdir/postscripts/xcatdsklspost $mode -m $snkey '$postscripts' --tftp $tftpdir --installdir $installdir --nfsv4 $nfsv4"
                     ];
             }