From 3db2c1817b434a4a09a492a45cad7e56dd4bc70e Mon Sep 17 00:00:00 2001
From: ligc <ligc@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 30 Dec 2011 08:57:37 +0000
Subject: [PATCH] fix for bug 3466334: if the /install is mounted from MN, the
 ospkgdir and otherpkgdir should be different

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11319 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT/postscripts/ospkgs    | 6 +++++-
 xCAT/postscripts/otherpkgs | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/xCAT/postscripts/ospkgs b/xCAT/postscripts/ospkgs
index 4a7f2f806..c2b4123d3 100755
--- a/xCAT/postscripts/ospkgs
+++ b/xCAT/postscripts/ospkgs
@@ -71,7 +71,11 @@ if [ $? -eq 0 ]; then
 fi
 
 if [ -z "$OSPKGDIR" ]; then
-    OSPKGDIR="$NFSSERVER$INSTALLDIR/$OSVER/$ARCH"
+    if [ $mounted -eq 0 ]; then
+        OSPKGDIR="$NFSSERVER$INSTALLDIR/$OSVER/$ARCH"
+    else
+        OSPKGDIR="$NFSSERVER/$OSVER/$ARCH"
+    fi
     if ( pmatch "$OSVER" "sles*" ); then
 	    OSPKGDIR="$OSPKGDIR/1"
     elif ( pmatch "$OSVER" "rhel*" ); then
diff --git a/xCAT/postscripts/otherpkgs b/xCAT/postscripts/otherpkgs
index bb0afce52..2fa36f409 100755
--- a/xCAT/postscripts/otherpkgs
+++ b/xCAT/postscripts/otherpkgs
@@ -229,7 +229,11 @@ if [ $? -eq 0 ]; then
 fi
 
 if [ -z "$OTHERPKGDIR" ]; then
-    OTHERPKGDIR="$NFSSERVER$INSTALLDIR/post/otherpkgs/$OSVER/$ARCH"
+    if [ $mounted -eq 0 ]; then
+        OTHERPKGDIR="$NFSSERVER$INSTALLDIR/post/otherpkgs/$OSVER/$ARCH"
+    else
+        OTHERPKGDIR="$NFSSERVER/post/otherpkgs/$OSVER/$ARCH"
+    fi
 fi
 
 if [ $mounted -eq 0 ]; then