From 55c4b9af40fdd487cce244cc6a7c9145a014f812 Mon Sep 17 00:00:00 2001
From: mellor <mellor@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 5 Apr 2010 04:41:51 +0000
Subject: [PATCH] HPC integration - fixed LL pkglist and install script

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5665 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../share/xcat/IBMhpc/IBMhpc.sles.postinstall | 21 +++++++++++--------
 .../xcat/IBMhpc/IBMhpc.sles11.ppc64.pkglist   |  2 ++
 .../compute.sles11.ppc64.otherpkgs.pkglist    |  2 +-
 .../xcat/IBMhpc/loadl/loadl.otherpkgs.pkglist |  1 +
 .../loadl.sles11.ppc64.otherpkgs.pkglist      |  1 -
 .../share/xcat/IBMhpc/loadl/loadl_install     |  9 +++++---
 6 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl.otherpkgs.pkglist
 delete mode 100644 xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl.sles11.ppc64.otherpkgs.pkglist

diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall
index bbd895ee2..6578b928c 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall
@@ -58,15 +58,18 @@ chroot $installroot chkconfig atd on
 chroot $installroot chkconfig xinetd on
 
 # Modify some ulimits
+if [ ! -f $installroot/etc/sysconfig/ulimit ]; then
+    cp -p /etc/sysconfig/ulimit $installroot/ect/sysconfig
+fi
 if [ ! -f $installroot/etc/sysconfig/ulimit.XCAT_BAK ]; then
-  cp -p $installroot/etc/sysconfig/ulimit $installroot/etc/sysconfig/ulimit.XCAT_BAK
-fi
-if [ -f $installroot/etc/sysconfig/ulimit ]; then
-    # max locked memory
-    /usr/bin/sed -i 's/HARDLOCKLIMIT=.*/HARDLOCKLIMIT="unlimited"/g'  $installroot/etc/sysconfig/ulimit
-    /usr/bin/sed -i 's/SOFTLOCKLIMIT=.*/SOFTLOCKLIMIT="unlimited"/g'  $installroot/etc/sysconfig/ulimit
-    # max memory size
-    /usr/bin/sed -i 's/HARDRESIDENTLIMIT=.*/HARDRESIDENTLIMIT="unlimited"/g'  $installroot/etc/sysconfig/ulimit
-    /usr/bin/sed -i 's/SOFTRESIDENTLIMIT=.*/SOFTRESIDENTLIMIT="unlimited"/g'  $installroot/etc/sysconfig/ulimit
+   cp -p $installroot/etc/sysconfig/ulimit $installroot/etc/sysconfig/ulimit.XCAT_BAK
 fi
+# max locked memory
+/usr/bin/sed -i 's/HARDLOCKLIMIT=.*/HARDLOCKLIMIT="unlimited"/g'  $installroot/etc/sysconfig/ulimit
+/usr/bin/sed -i 's/SOFTLOCKLIMIT=.*/SOFTLOCKLIMIT="unlimited"/g'  $installroot/etc/sysconfig/ulimit
+# max memory size
+/usr/bin/sed -i 's/HARDRESIDENTLIMIT=.*/HARDRESIDENTLIMIT="unlimited"/g'  $installroot/etc/sysconfig/ulimit
+/usr/bin/sed -i 's/SOFTRESIDENTLIMIT=.*/SOFTRESIDENTLIMIT="unlimited"/g'  $installroot/etc/sysconfig/ulimit
+
+
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles11.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles11.ppc64.pkglist
index 82a3f812a..b663f48fb 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles11.ppc64.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles11.ppc64.pkglist
@@ -35,7 +35,9 @@ xorg-x11-libXp-32bit
 xorg-x11-libXau-32bit
 xorg-x11-libXext-32bit
 xorg-x11-libxcb-32bit
+xorg-x11-libXmu
 xorg-x11-libXmu-32bit
+xorg-x11-libs
 xorg-x11-libs-32bit
 xorg-x11-libX11
 xorg-x11-libXext
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist
index 3fdab39cc..eb0e6c614 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist
@@ -6,4 +6,4 @@
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.otherpkgs.pkglist#
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe.otherpkgs.pkglist#
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/essl/essl.otherpkgs.pkglist#
-#INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl.sles11.ppc64.otherpkgs.pkglist#
+#INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl.otherpkgs.pkglist#
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl.otherpkgs.pkglist
new file mode 100644
index 000000000..2d30ca691
--- /dev/null
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl.otherpkgs.pkglist
@@ -0,0 +1 @@
+loadl/LoadL-full-license-*
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl.sles11.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl.sles11.ppc64.otherpkgs.pkglist
deleted file mode 100644
index 454e7e3bf..000000000
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl.sles11.ppc64.otherpkgs.pkglist
+++ /dev/null
@@ -1 +0,0 @@
-loadl/LoadL-full-license-SLES11-PPC64
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install
index 52f41bc20..066e3781f 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install
@@ -45,8 +45,10 @@ if [ $OS != "AIX" ]; then
         mkdir $installroot/$tmpdir
         cp -p $LOADL_DIR/* $installroot/$tmpdir
         # The license rpm should already be installed, but just in case...
-        rpm --root $installroot rpm -Uvh $installroot/$tmpdir/LoadL-full-license*.rpm
+        rpm --root $installroot -Uvh $installroot/$tmpdir/LoadL-full-license*.rpm
+        chroot $installroot mount -t proc none /proc
         chroot $installroot $linux_loadl_license_script -y -d  /$tmpdir
+        umount -l $installroot/proc
         rm -rf $installroot/$tmpdir
 
         mkdir $installroot/dev/cpuset
@@ -107,6 +109,7 @@ chmod 777 $installroot$logdir/core
 # Owner set to 'loadl' userid, change if using a different userid
 chown -R loadl:loadl $installroot$logdir/
 
-cp /etc/LoadL.cfg $installroot/etc/LoadL.cfg
-
+if [ -f /etc/LoadL.cfg ] ; then
+    cp /etc/LoadL.cfg $installroot/etc/LoadL.cfg
+fi