From b06ae22ded0292987322b7629dac4c0171b3cd93 Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 6 Jun 2012 15:35:57 +0000
Subject: [PATCH] Fixing bug 3532416 and 3532496.  Handle them by code instead
 of document.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@13015 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../xcat/IBMhpc/compilers/compilers_license   |  2 +-
 .../share/xcat/IBMhpc/pe/pe_install-1200      | 21 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license
index 92c0d8b05..57a296402 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license
@@ -29,7 +29,7 @@ if [ $OS != "AIX" ]; then
        #if [ -n "`ls xlmass.lib-6.1.0*.rpm 2> /dev/null`" ] ; then
        #    rpm -ivh --oldpackage xlmass.lib-6.1.0*.rpm
        #fi
-       #cd $installroot
+       #cd $installroot/
        #rm -f -R /tmp/compilers/
 
        if [ -n "$vacpp_script" ] ; then
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200
index 1917837ce..93f0d8acb 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200
@@ -76,7 +76,11 @@ fi
 if [ "$OS" != "AIX" ]; then
     gen_xlf=`grep PE_LATEST_LEVEL $installroot/etc/ppe.cfg | cut -f2 -d ' ' `/mpich2/sbin/xlf_gen_mpimod
     if [ -x $installroot/$gen_xlf ] ; then
-          chroot $installroot $gen_xlf
+          if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then
+              $gen_xlf
+          else
+              chroot $installroot $gen_xlf
+          fi
     fi
 fi
 
@@ -91,8 +95,15 @@ fi
 
 # BSR configuration, uncomment the following lines to enable BSR configuration on Power Linux cluter.  
 #if [ "$OS" != "AIX" ]; then
-#    chroot $installroot groupadd bsr
-#    chroot $installroot mkdir -p /var/lib/bsr
-#    chroot $installroot chown root:bsr /var/lib/bsr
-#    chroot $installroot chmod g+sw /var/lib/bsr
+#    if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then
+#        groupadd bsr
+#        mkdir -p /var/lib/bsr
+#        chown root:bsr /var/lib/bsr
+#        chmod g+sw /var/lib/bsr
+#    else
+#        chroot $installroot groupadd bsr
+#        chroot $installroot mkdir -p /var/lib/bsr
+#        chroot $installroot chown root:bsr /var/lib/bsr
+#        chroot $installroot chmod g+sw /var/lib/bsr
+#    fi
 #fi