From e1e7a48c359914b12ae4225291c4163feee4f7c4 Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 17 Nov 2010 07:46:45 +0000
Subject: [PATCH] add ksh.ppc64 into the IBMhpc.rhel6.ppc64.pkglist and
 min-IBMhpc.rhel6.ppc64.pkglist

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8182 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../share/xcat/IBMhpc/IBMhpc.rhel6.ppc64.pkglist      |  1 +
 xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install       | 11 ++++++-----
 .../share/xcat/IBMhpc/min-IBMhpc.rhel6.ppc64.pkglist  |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel6.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel6.ppc64.pkglist
index 5f8f5f7ff..a380aa45a 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel6.ppc64.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel6.ppc64.pkglist
@@ -6,6 +6,7 @@ rsh
 rsh-server
 at.ppc64
 sed.ppc64
+ksh.ppc64
 
 compat-libstdc++-33.ppc
 compat-libstdc++-33.ppc64
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
index 76b080434..3d9ec7e5a 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
@@ -28,11 +28,12 @@ if [ $OS != "AIX" ]; then
         cd /tmp/essl
         download_dir=`echo $ESSL_DIR | cut -d '/' -f3-`
         wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=5 ftp://$SITEMASTER/$download_dir/*.rpm 2> /tmp/wget.log
-        rpm -Uvh essl.license*.rpm
-        install_essl=`find /opt/ibmmath/essl -name install_essl -print`
-        if [ -n "$install_essl" ] ; then
-            $install_essl -y -d . -nodocs
-        fi
+        #rpm -Uvh essl.license*.rpm
+        IBM_ESSL_LICENSE_ACCEPT=yes rpm -Uvh essl*.rpm
+        #install_essl=`find /opt/ibmmath/essl -name install_essl -print`
+        #if [ -n "$install_essl" ] ; then
+        #    $install_essl -y -d . -nodocs
+        #fi
         rpm -Uvh pessl.license*.rpm
         install_pessl=`find /opt/ibmmath/pessl -name install_pessl -print`
         if [ -n "$install_pessl" ] ; then
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhel6.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhel6.ppc64.pkglist
index 8dec81a65..b699a2e2c 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhel6.ppc64.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhel6.ppc64.pkglist
@@ -5,6 +5,7 @@ xinetd
 rsh
 rsh-server
 sed.ppc64
+ksh.ppc64
 
 compat-libstdc++-33.ppc
 compat-libstdc++-33.ppc64