From 5ebe7d4122c7050364a74891ff8ba7eb794d0ca4 Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 2 May 2012 05:10:46 +0000
Subject: [PATCH] Updated GPFS integration to use otherpkg and pkg list to
 install gpfs rpms

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12444 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../IBMhpc/gpfs/gpfs.ppc64.otherpkgs.pkglist  |  4 ++
 .../IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist |  4 ++
 .../share/xcat/IBMhpc/gpfs/gpfs_updates       | 37 -------------------
 3 files changed, 8 insertions(+), 37 deletions(-)
 create mode 100644 xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs.ppc64.otherpkgs.pkglist
 create mode 100644 xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist

diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs.ppc64.otherpkgs.pkglist
new file mode 100644
index 000000000..e9d4e3032
--- /dev/null
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs.ppc64.otherpkgs.pkglist
@@ -0,0 +1,4 @@
+gpfs/gpfs.base
+gpfs/gpfs.gpl
+gpfs/gpfs.gplbin*
+gpfs/gpfs.msg.en_US
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist
new file mode 100644
index 000000000..e9d4e3032
--- /dev/null
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist
@@ -0,0 +1,4 @@
+gpfs/gpfs.base
+gpfs/gpfs.gpl
+gpfs/gpfs.gplbin*
+gpfs/gpfs.msg.en_US
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates
index 5ce3feb0c..e7ffdbfc8 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates
@@ -31,43 +31,6 @@ if [ -n "$1" ]; then
 fi
 
 OS=`uname`
-INSTALL_DIR='/install'
-UPDATES_DIR='post/otherpkgs/gpfs_updates'
-
-if [ $OS != "AIX" ]; then
-    if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then
-    #  Being run from a stateful install postscript
-    #  Copy rpms directly from the xCAT management node and install        
-        mkdir -p /tmp/gpfs_updates
-        rm -f -R /tmp/gpfs_updates/*
-        cd /tmp/gpfs_updates
-#        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=3 ftp://$SITEMASTER/$UPDATES_DIR/*.rpm 2> /tmp/wget.log
-        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=4 --reject "index.html*"  --no-parent http://$SITEMASTER$INSTALL_DIR/$UPDATES_DIR/ 2> /tmp/wget.log
-        if [ -n "`ls *.rpm 2> /dev/null`" ] ; then
-            rpm -Uvh *.rpm
-        fi
-        cd /
-        rm -f -R /tmp/gpfs_updates
-    fi
-
-    if [ $NODESETSTATE == "genimage" ]; then
-      if [ -d $INSTALL_DIR/$UPDATES_DIR ] ;  then
-    # Being called from <image>.postinstall script
-    # Assume we are on the same machine
-        if [[ $OS = sles* ]] || [[ $OS = suse* ]] || [[ -f /etc/SuSE-release ]]; then
-        # For SLES, assume zypper is available on the system running genimage
-            zypper -R $installroot ar file:$INSTALL_DIR/$UPDATES_DIR gpfs_updates
-        #   zypper -R $installroot install gpfs.gplbin*
-            zypper -R $installroot update  gpfs*
-            zypper -R $installroot rr gpfs_updates
-        else
-	# For Redhat, etc., assume yum is available on the system running genimage
-             yum -y --installroot $installroot --nogpgcheck localupdate $INSTALL_DIR/$UPDATES_DIR/*.rpm
-        fi
-      fi
-    fi
-fi  
-
 
 ## Create an empty nsddevices script for GPFS 
 ## This assumes that the node is NOT an NSD server