install.pl: Update list of the in-box packages to be uninstalled

Bug: https://bugs.openfabrics.org/show_bug.cgi?id=2692

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

diff --git a/install.pl b/install.pl
index 45a3cd56121491f480b27185ec95eebaa5e67573..a75032053c1369142080f643612c58e49bf5763c 100755 (executable)
--- a/install.pl
+++ b/install.pl
@@ -515,11 +515,13 @@ my @prev_ofed_packages = (
 
 
 my @distro_ofed_packages = (
-                        "libamso", "libamso-devel", "dapl2", "dapl2-devel", "mvapich", "mvapich2", "mvapich2-devel",
-                        "mvapich-devel", "libboost_mpi1_36_0", "boost-devel", "boost-doc", "libmthca-rdmav2", "libcxgb3-rdmav2", "libcxgb4-rdmav2",
-                        "libmlx4-rdmav2", "libnes-rdmav2", "libi40iw-rdmav2", "libqedr-rdmav2", "libbnxt_re-rdmav2", "libvmw_pvrdma-rdmav2",
-                       "libibverbs1", "libibmad1", "libibumad1", "libibcommon1", "ofed", "ofa", "libibdm1", "libibcm1", "libibnetdisc5",
-                       "scsi-target-utils", "rdma-ofa-agent", "libibumad3", "libibmad5", "libibverbs-runtime", "librdmacm1", "libi40iw",
+                       "libamso", "libamso-devel", "dapl2", "dapl2-devel", "mvapich", "mvapich2", "mvapich2-devel",
+                       "mvapich-devel", "libboost_mpi1_36_0", "boost-devel", "boost-doc", "libmthca-rdmav2", "libcxgb3-rdmav2", "libcxgb4-rdmav2",
+                       "libmlx4-rdmav2", "libnes-rdmav2", "libi40iw-rdmav2", "libqedr-rdmav2", "libbnxt_re-rdmav2", "libvmw_pvrdma-rdmav2",
+                       "libibverbs1", "libibmad1", "libibumad1", "libibcommon1", "ofed", "ofa", "libibdm1", "libibcm1", "libibnetdisc5",
+                       "scsi-target-utils", "rdma-ofa-agent", "libibumad3", "libibmad5", "libibverbs-runtime", "librdmacm1", "libi40iw",
+                       "libosmvendor", "libosmcomp", "libosmcomp3",
+                       "libibverbs", "libmlx4-1", "libmlx5-1", "libopensm5", "libosmvendor4",
                         );
 
 my @mlnx_en_packages = (
@@ -3161,6 +3163,18 @@ sub uninstall
                 force_uninstall();
             }
         } else {
+            my $request_force_uninstall = 0;
+            my @other_ofed_rpms = `rpm -qa 2> /dev/null | grep -wE "rdma|ofed|openib|ofa_kernel"`;
+            for my $package (@all_packages, @hidden_packages, @prev_ofed_packages, @other_ofed_rpms, @distro_ofed_packages, @chelsio_uwire_packages) {
+                chomp $package;
+                if (is_installed($package)) {
+                    $request_force_uninstall = 1;
+                    last;
+                }
+            }
+            if ($request_force_uninstall) {
+                force_uninstall();
+            }
             return 0;
         }
     } else {