From b8b8c3db7c96cb3d1a278e800b449a71c3e836ad Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 8 Mar 2012 11:40:45 +0000
Subject: [PATCH] ppe_rte_license should be installed firstly which prevents
 'ppe*.rpm' installing later.  Use --force option to update rpm packages

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

diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200
index be26a4820..10e744460 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200
@@ -46,10 +46,10 @@ if [ $OS != "AIX" ]; then
 #        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=5 http://$SITEMASTER/$PE_DIR/*.rpm 2> /tmp/wget.log
         wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=6 --reject "index.html*"  --no-parent http://$SITEMASTER$PE_DIR/ 2> /tmp/wget.log
         if [ ! -f /opt/ibmhpc/pe1200/sbin/accept_ppe_license.sh ] ; then
-            rpm -Uvh pe/ppe_rte_license*.rpm
+            rpm -Uvh ppe_rte_license*.rpm
         fi
         IBM_PPE_RTE_LICENSE_ACCEPT=yes /opt/ibmhpc/pe1200/sbin/accept_ppe_license.sh
-        rpm -Uvh ppe*.rpm 
+        rpm -Uvh --force ppe*.rpm 
         cd /
         rm -Rf /tmp/pe
     fi