From 37c0f9a382f9f0d6956424c20a32fdc96b93ccb8 Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 3 Jul 2013 06:10:51 +0000
Subject: [PATCH] in some of the mlnxofedinstall script from Mellanox OFED iso,
 there is not --nodeps to uninstall the libibverbs package. But the new pe
 kits are depended on the libibberbs. So I add the rpm -e --nodeps
 --allmatches libibverbs in mlnxofed_ib_install to uninstall the libibverbs
 before invoking the mlnxofedinstall script

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16865 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install
index 9d2294765..96b3aa7bb 100755
--- a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install
+++ b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install
@@ -111,8 +111,9 @@ if [ $OS != "AIX" ]; then
             mount --bind  /sys $installroot/sys
             mount --bind /proc $installroot/proc
             chroot $installroot rpm -e --noscripts --allmatches mlnx-ofa_kernel-kmp-default 2>/dev/null 
+            chroot $installroot rpm -e --nodeps --allmatches libibverbs 2>/dev/null 
             #chroot $installroot perl -x /tmp/ofed_install/ofed/mlnxofedinstall --without-32bit --force
-            chroot $installroot perl -x /tmp/ofed_install/mlnxofedinstall $mlnxofed_options
+            chroot $installroot perl -x /tmp/ofed_install/ofed/mlnxofedinstall $mlnxofed_options
             rm -rf $installroot/tmp/ofed_install
             umount $installroot/dev/
             umount $installroot/sys
@@ -120,8 +121,9 @@ if [ $OS != "AIX" ]; then
         else
             mkdir $installroot/tmp/ofed_install
             cp -r $OFED_DIR/ $installroot/tmp/ofed_install/ 
+            chroot $installroot rpm -e --nodeps --allmatches libibverbs 2>/dev/null 
             #chroot $installroot perl -x /tmp/ofed_install/ofed/mlnxofedinstall --without-32bit --force
-            chroot $installroot perl -x /tmp/ofed_install/mlnxofedinstall $mlnxofed_options
+            chroot $installroot perl -x /tmp/ofed_install/ofed/mlnxofedinstall $mlnxofed_options
             rm -rf $installroot/tmp/ofed_install
         fi