From cb2b559785535c96ec85af39736a72898c1b74aa Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 21 May 2012 17:45:01 +0000
Subject: [PATCH] fix defect 3528566

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12848 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/sbin/xcatconfig | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig
index 6c33b8e51..72c6cdce8 100755
--- a/xCAT-server/sbin/xcatconfig
+++ b/xCAT-server/sbin/xcatconfig
@@ -1529,7 +1529,9 @@ sub setupAIXIPMITool
 
 =head3    setupAIXexports 
 	
-    Set AIX exports 
+    Set AIX exports
+      remove the old /install/postscripts export and add
+      a /install export 
 
 =cut
 
@@ -1538,25 +1540,42 @@ sub setupAIXIPMITool
 sub setupAIXexports
 
 {
-    # check if /install/postscripts is exported
+    # check if /install/postscripts is exported, remove it
     my $lsnfsexpcmd =
       "/usr/sbin/lsnfsexp -d $::INSTALLDIR/postscripts 2>&1";
     my $outref = xCAT::Utils->runcmd("$lsnfsexpcmd", -1);
+    if ($::RUNCMD_RC == 0)
+    {
+       if ($outref) {  # really is exported
+        # remove it 
+        my $rmnfsexpcmd= "/usr/sbin/rmnfsexp -d $::INSTALLDIR/postscripts 2>&1";
+        xCAT::Utils->runcmd("$rmnfsexpcmd", -1);
+        if ($::RUNCMD_RC != 0)
+        {
+            xCAT::MsgUtils->message('E',
+                     "Could not unexport directory $::INSTALLDIR/postscripts.");
+        }
+       }
+    }
+    # check if /install is exported
+    my $lsnfsexpcmd =
+      "/usr/sbin/lsnfsexp -d $::INSTALLDIR 2>&1";
+    my $outref = xCAT::Utils->runcmd("$lsnfsexpcmd", -1);
     if (($::RUNCMD_RC != 0) || ($outref !~ /-vers=3:4/))
     {
 
         # if not exported for both NFS version 3 and version 4,
         # make sure it is exported with -vers=3:4
-        my $rmnfsexpcmd = "/usr/sbin/rmnfsexp -d $::INSTALLDIR/postscripts 2>&1";
+        my $rmnfsexpcmd = "/usr/sbin/rmnfsexp -d $::INSTALLDIR 2>&1";
         xCAT::Utils->runcmd("$rmnfsexpcmd", -1);
 
         my $mknfsexpcmd =
-          "mknfsexp -d $::INSTALLDIR/postscripts '-B' -v '3,4' -t 'ro'";
+          "mknfsexp -d $::INSTALLDIR '-B' -v '3,4' -t 'ro'";
         my $outref2 = xCAT::Utils->runcmd("$mknfsexpcmd", -1);
         if ($::RUNCMD_RC != 0)
         {
             xCAT::MsgUtils->message('E',
-                                    "Could not export directory $::INSTALLDIR/postscripts.");
+                                "Could not export directory $::INSTALLDIR.");
         }
     }
 }