From 97e04e13023545141f066c27978ee43eaea9fcfa Mon Sep 17 00:00:00 2001
From: mellor <mellor@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 6 Apr 2010 19:00:21 +0000
Subject: [PATCH] HPC Integration defect 2892701 - change pe install to work
with both 3.1.4 and 3.1.5 versions of sci rpms
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5689 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
index 92c8db976..9c538c88c 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
@@ -43,7 +43,7 @@ if [ $OS != "AIX" ]; then
download_dir=`echo $PE_DIR | cut -d '/' -f3-`
wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 -nH --cut-dirs=3 ftp://$SITEMASTER/$download_dir/*.rpm 2> /tmp/wget.log
rpm -Uvh IBM_pe_license*.rpm
- rpm -Uvh ibm_lapi*.rpm ibm_pe*.rpm ppe_*.rpm sci_*.rpm
+ rpm -Uvh ibm_lapi*.rpm ibm_pe*.rpm ppe_*.rpm *sci_*.rpm
cd /
rm -Rf /tmp/pe
fi
@@ -64,7 +64,7 @@ if [ $OS != "AIX" ]; then
mkdir -p $installroot/etc/opt/ibmhpc/license
cp -pR /etc/opt/ibmhpc/license/* $installroot/etc/opt/ibmhpc/license
# Install PE product rpms
- zypper -R $installroot install $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm $PE_DIR/sci_*.rpm
+ zypper -R $installroot install $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm $PE_DIR/*sci_*.rpm
else
# For Redhat, etc., assume yum is available on the system running genimage
if [ ! -d /etc/opt/ibmhpc/license ] ; then
@@ -78,7 +78,7 @@ if [ $OS != "AIX" ]; then
mkdir -p $installroot/etc/opt/ibmhpc/license
cp -pR /etc/opt/ibmhpc/license/* $installroot/etc/opt/ibmhpc/license
# Install PE product rpms
- yum --installroot $installroot --nogpgcheck localupdate $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm $PE_DIR/sci_*.rpm
+ yum --installroot $installroot --nogpgcheck localupdate $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm $PE_DIR/*sci_*.rpm
fi
fi
fi