From d3b856dd2ef2c75204e81ff2153059ccb5d3df26 Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 29 Jul 2010 07:21:41 +0000
Subject: [PATCH] HPC integration supports for RSCT in statelite and stateless
 cluster

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

diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install
index 3130ddd04..7db820e55 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -vx
 
 # 
 # Sample script to accept licenses and install RSCT packages
@@ -20,17 +20,32 @@ fi
 
 
 if [ $OS != "AIX" ]; then
- #   if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ] ; then
+    #if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ] ; then
     #  Being run from a stateful install postscript
     #  Do nothing - use rsct.otherpkgs.pkglist to install the
     #  rsct rpms
-#    fi
+    #fi
+ 
 
     if [ $NODESETSTATE == "genimage" ]; then
     # Being called from <image>.postinstall script
     # Assume we are on the same machine
-        INUCLIENTS=1 INUBOSTYPE=1  rpm --root $installroot --force -Uvh $RSCT_DIR/src-* $RSCT_DIR/rsct.core-* $RSCT_DIR/rsct.core.utils-*
+        if [[ $OS = sles* ]] || [[ $OS = suse* ]] || [[ -f /etc/SuSE-release ]]; then
+        # For SLES, assume zypper is available on the system running genimage
+            # rsct don't need license. So not install and accept the rsct license on the MN
+            
+            # Install RSCT product rpms
+            INUCLIENTS=1 INUBOSTYPE=1 zypper -R $installroot install $RSCT_DIR/src-*.rpm $RSCT_DIR/rsct.core-*.rpm $RSCT_DIR/rsct.core.utils-*.rpm 
+        else
+        # For Redhat, etc., assume yum is available on the system running genimage
+            # rsct don't need license. So not install and accept the rsct license on the MN
+            # Install RSCT product rpms
+            INUCLIENTS=1 INUBOSTYPE=1 yum --installroot $installroot --nogpgcheck localupdate $RSCT_DIR/src-*.rpm $RSCT_DIR/rsct.core-*.rpm $RSCT_DIR/rsct.core.utils-*.rpm 
+        fi
     fi
+
+
+
 fi