From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Sun, 4 Dec 2016 15:54:20 +0000 (+0200)
Subject: install.pl: Force infiniband-diags installation due to conflict with rdma-core
X-Git-Tag: vofed-4.8-rc4~15
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a06a43554821e8ae19f0905d4b2d917b83a734dd;p=~vlad%2Fofed_scripts.git

install.pl: Force infiniband-diags installation due to conflict with rdma-core

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---

diff --git a/install.pl b/install.pl
index d92f8ed..8d7181e 100755
--- a/install.pl
+++ b/install.pl
@@ -2537,6 +2537,11 @@ sub install_rpm
         $cmd .= " --nodeps";
     }
 
+    if ($name =~ m/infiniband-diags/) {
+	    # Force infiniband-diags installation due to conflict with rdma-core
+        $cmd .= " --force";
+    }
+
     $cmd .= " $package";
 
     print "Running $cmd\n" if ($verbose);