From 12c8b78211f88fbb3c988b9d07d4a67acffc23ba Mon Sep 17 00:00:00 2001
From: mellor <mellor@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 3 Jun 2010 20:33:10 +0000
Subject: [PATCH] added comments to loadl_install script to clarify how to edit
 to install LL scheduler pkg

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6346 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../share/xcat/IBMhpc/loadl/loadl_install     | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install
index 32ab88652..bbf5decaf 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install
@@ -19,9 +19,24 @@
 OS=`uname`
 INSTALL_DIR='/install'
 LOADL_DIR=$loadldir
-aix_loadl_bin=/usr/lpp/LoadL/resmgr/full/bin
+
+#### 
+#  Linux Note:  This script only installs the LoadL_resmgr_full rpm
+#  To also install the LoadL_scheduler rpm, remove the "-c resmgr"
+#  option from the line below
+#  Also, change the bin path below to the correct directory
+#### 
+linux_loadl_license_script=/opt/ibmll/LoadL/sbin/install_ll -c resmgr
 linux_loadl_bin=/opt/ibmll/LoadL/resmgr/full/bin
-linux_loadl_license_script=/opt/ibmll/LoadL/sbin/install_ll
+
+####
+# For AIX, the LoadLeveler lpps are listed in the loadl.bnd bundle file
+# By default, it will only install the LoadL.resmgr package
+# To install the full LoadLeveler product, edit that bundle file
+# and change the bin path below to the correct directory
+####
+aix_loadl_bin=/usr/lpp/LoadL/resmgr/full/bin
+
 
 logdir=/var/loadl
 loadl_admin=loadl
@@ -43,7 +58,7 @@ if [ $OS != "AIX" ]; then
         download_dir=`echo $LOADL_DIR | cut -d '/' -f3-`
         wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=5 ftp://$SITEMASTER/$download_dir/*.rpm 2> /tmp/wget.log
         rpm -Uvh LoadL-full-license*.rpm
-        $linux_loadl_license_script -c resmgr -y -d .
+        $linux_loadl_license_script -y -d .
         rm -Rf /tmp/loadl
         mkdir /dev/cpuset
         mount -t cpuset none /dev/cpuset
@@ -58,7 +73,7 @@ if [ $OS != "AIX" ]; then
         # The license rpm should already be installed, but just in case...
         rpm --root $installroot -Uvh $installroot/$tmpdir/LoadL-full-license*.rpm
         chroot $installroot mount -t proc none /proc
-        chroot $installroot $linux_loadl_license_script -c resmgr -y -d  /$tmpdir
+        chroot $installroot $linux_loadl_license_script -y -d  /$tmpdir
         umount -l $installroot/proc
         rm -rf $installroot/$tmpdir
     fi