From 06905cea5b5dfee8c64a61e5c9bcb6eedc852b2f Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 5 Nov 2010 08:25:38 +0000
Subject: [PATCH] remove installing the IBM_pe_license* if the
 /etc/opt/ibmhpc/license exists.

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

diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
index 77dd71dc8..3cfdbb677 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
@@ -64,7 +64,7 @@ if [ $OS != "AIX" ]; then
             fi
             # Install PE license rpm into image, BUT DO NOT ACCEPT
             # The java process fails when you try to run in chroot
-            zypper -R $installroot install $PE_DIR/IBM_pe_license*.rpm
+            #zypper -R $installroot install $PE_DIR/IBM_pe_license*.rpm
             # Copy license files from MN into the image
             mkdir -p $installroot/etc/opt/ibmhpc/license
             cp -pR /etc/opt/ibmhpc/license/* $installroot/etc/opt/ibmhpc/license
@@ -79,7 +79,7 @@ if [ $OS != "AIX" ]; then
             fi
             # Install PE license rpm into image, BUT DO NOT ACCEPT
             # The java process fails when you try to run in chroot
-            yum --installroot $installroot --nogpgcheck install  $PE_DIR/IBM_pe_license*.rpm
+            #yum --installroot $installroot --nogpgcheck install  $PE_DIR/IBM_pe_license*.rpm
             # Copy license files from MN into the image
             mkdir -p $installroot/etc/opt/ibmhpc/license
             cp -pR /etc/opt/ibmhpc/license/* $installroot/etc/opt/ibmhpc/license