From 3c3612546a2da731e487adc7ab6774894d0750a2 Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 7 Dec 2012 09:34:39 +0000
Subject: [PATCH] currently, our ospkgs script in xCAT 2.7 doesn't work. Fixed
 it

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@14583 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT/postscripts/ospkgs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/xCAT/postscripts/ospkgs b/xCAT/postscripts/ospkgs
index 38fff7116..4b07528b9 100755
--- a/xCAT/postscripts/ospkgs
+++ b/xCAT/postscripts/ospkgs
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh 
 # IBM(c) 2010 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 #-------------------------------------------------------------------------------
@@ -101,6 +101,16 @@ if [ -z "$OSPKGDIR" ]; then
     fi
 fi
 
+default_pkgdir="$INSTALLDIR/$OSVER/$ARCH"
+if [ $OSPKGDIR == $default_pkgdir ]; then
+    if ( pmatch "$OSVER" "rhels5*" ); then
+        if [ $ARCH == "x86_64" ]; then
+            OSPKGDIR="$OSPKGDIR/Server"
+        fi
+    fi
+fi
+
+
 if [ "$SDKDIR" != "" ]; then 
     if [ $mounted -eq 0 ]; then
         SDKDIR="$NFSSERVER/$SDKDIR"
@@ -108,11 +118,12 @@ if [ "$SDKDIR" != "" ]; then
 fi
     
 if [ $mounted -eq 0 ]; then
-    OSPKGDIR_NO_PREFIX=${OSPKGDIR#$INSTALLDIR}
+    #OSPKGDIR_NO_PREFIX=${OSPKGDIR#$INSTALLDIR}
 
-    if [ "$OSPKGDIR" != "$OSPKGDIR_NO_PREFIX" ]; then
-        OSPKGDIR="$NFSSERVER/$OSPKGDIR_NO_PREFIX"
-    fi
+    #if [ "$OSPKGDIR" != "$OSPKGDIR_NO_PREFIX" ]; then
+    #    OSPKGDIR="$NFSSERVER/$OSPKGDIR_NO_PREFIX"
+    #fi
+    OSPKGDIR="$NFSSERVER/$OSPKGDIR"
 fi
 
 logger -t xcat "NFSSERVER=$NFSSERVER"