From d5db9b75273f494655d916d654b489164f0b4aeb Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 10 Sep 2010 07:45:41 +0000
Subject: [PATCH] packaging and install procedures for ESSL 5.1 were changed,
 so I changed the installation in the essl_install

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7403 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
index 87bb92e8f..76b080434 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh 
 
 # 
 # Sample script to accept licenses and install ESSL and PESSL packages
@@ -47,12 +47,13 @@ if [ $OS != "AIX" ]; then
         tmpdir=tmpessl
         mkdir $installroot/$tmpdir
         cp -p $ESSL_DIR/* $installroot/$tmpdir
-        rpm --root $installroot -Uvh $installroot/$tmpdir/essl.license*.rpm
+        #rpm --root $installroot -Uvh $installroot/$tmpdir/essl.license*.rpm
+        IBM_ESSL_LICENSE_ACCEPT=yes rpm --root $installroot -Uvh $installroot/$tmpdir/essl*.rpm
         cd $installroot
-        install_essl=`find opt/ibmmath/essl -name install_essl -print`
-        if [ -n "$install_essl" ] ; then
-            chroot $installroot /$install_essl -y -nodocs -d /$tmpdir
-        fi
+        #install_essl=`find opt/ibmmath/essl -name install_essl -print`
+        #if [ -n "$install_essl" ] ; then
+        #    chroot $installroot /$install_essl -y -nodocs -d /$tmpdir
+        #fi
         rpm --root  $installroot -Uvh $installroot/$tmpdir/pessl.license*.rpm
         install_pessl=`find opt/ibmmath/pessl -name install_pessl -print`
         if [ -n "$install_pessl" ] ; then