From 389b987abaa6d97e443ebeb6ccfe4fbe17e8379d Mon Sep 17 00:00:00 2001
From: mellor <mellor@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 5 Apr 2010 17:54:34 +0000
Subject: [PATCH] HPC integration - think I FINALLY have a fix that works for
 PE license accept

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5670 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../share/xcat/IBMhpc/IBMhpc.sles.postinstall |  2 +-
 .../share/xcat/IBMhpc/pe/pe.otherpkgs.pkglist |  3 +-
 xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install   | 39 ++++++++++++++++---
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall
index ac94e8cc4..11c4dd04d 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall
@@ -60,7 +60,7 @@ chroot $installroot chkconfig xinetd on
 
 # Modify some ulimits
 if [ ! -f $installroot/etc/sysconfig/ulimit ]; then
-    cp -p /etc/sysconfig/ulimit $installroot/ect/sysconfig
+    cp -p /etc/sysconfig/ulimit $installroot/etc/sysconfig
 fi
 if [ ! -f $installroot/etc/sysconfig/ulimit.XCAT_BAK ]; then
    cp -p $installroot/etc/sysconfig/ulimit $installroot/etc/sysconfig/ulimit.XCAT_BAK
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.otherpkgs.pkglist
index aa2b3c7fb..390059f44 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.otherpkgs.pkglist
@@ -1 +1,2 @@
-pe/ibm-java2-ppc64-jre
+#  No PE otherpkgs at this time
+#  All PE packages are installed through the pe_install postinstall script
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
index 2fd883912..92c8db976 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
@@ -3,6 +3,16 @@
 # For AIX:
 #    TBD
 # For Linux:
+#    - For full-disk installs:
+#        - Copy rpms to node
+#        - Install and accept PE license rpm
+#        - Install PE rpms
+#    - For diskless images:
+#        - Install PE license on MN if not already installed
+#        - Install PE license rpm into image, but DO NOT ACCEPT
+#          (java accept program will hang)
+#        - Copy PE license files from MN into image
+#        - Install PE rpms
 #    - Create a smaller PNSD log file in /tmp 
 #    - Configure poe.limits file
 
@@ -41,18 +51,35 @@ if [ $OS != "AIX" ]; then
     if [ $NODESETSTATE == "genimage" ]; then
     # Being called from <image>.postinstall script
     # Assume we are on the same machine
-        chroot $installroot mount -t proc none /proc
         if [[ $OS = sles* ]] || [[ $OS = suse* ]] || [[ -f /etc/SuSE-release ]]; then
         # For SLES, assume zypper is available on the system running genimage
-
-            IBM_PE_LICENSE_PROMPT=N zypper -R $installroot install $PE_DIR/IBM_pe_license*.rpm
+            if [ ! -d /etc/opt/ibmhpc/license ] ; then
+            # Install and accept PE license on the MN
+                IBM_PE_LICENSE_PROMPT=N zypper install $PE_DIR/IBM_pe_license*.rpm
+            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
+            # 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
+            # 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
         else
         # For Redhat, etc., assume yum is available on the system running genimage
-             IBM_PE_LICENSE_PROMPT=N yum --installroot $installroot --nogpgcheck localupdate  $PE_DIR/IBM_pe_license*.rpm
-             yum --installroot $installroot --nogpgcheck localupdate $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm $PE_DIR/sci_*.rpm
+            if [ ! -d /etc/opt/ibmhpc/license ] ; then
+            # Install and accept PE license on the MN
+                IBM_PE_LICENSE_PROMPT=N yum --nogpgcheck localupdate  $PE_DIR/IBM_pe_license*.rpm
+            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 localupdate  $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
+            # 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
         fi
-        umount -l $installroot/proc
     fi
 fi