From: Jeff Becker <Jeffrey.C.Becker@nasa.gov>
Date: Wed, 12 Nov 2008 19:41:48 +0000 (-0800)
Subject: install.pl fix for bugzilla 1346:
X-Git-Tag: vofed-1.4-rc5~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4905115f474e37f1de7ddae6f84afca7c05b73e9;p=~tnikolova%2Fofed_scripts%2F.git

install.pl fix for bugzilla 1346:
NFS-RDMA: nfs-utils source installation not being detected by OFED
installation script.

Signed-off-by: Jeff Becker <Jeffrey.C.Becker@nasa.gov>
---

diff --git a/install.pl b/install.pl
index 5b89fa1..5cf3057 100755
--- a/install.pl
+++ b/install.pl
@@ -2546,16 +2546,17 @@ sub check_linux_dependencies
             if ($package eq 'kernel-ib' and $kernel_modules_info{'nfsrdma'}{'selected'}) {
                 my $req_name = 'nfs-utils';
                 my $req_version = '1.1.1';
-                if (is_installed($req_name)) {
-                    my $inst_version = get_rpm_ver_inst($req_name);
+                my $mount = `mount.nfs -V 2> /dev/null`;
+                if ($mount =~ /$req_name (\d.\d.\d)/) {
+                    my $inst_version = $1;
                     print "check_linux_dependencies: $req_name installed version $inst_version, required at least $req_version\n" if ($verbose3);
                     if ($inst_version lt $req_version) {
-                        print RED "$req_name-$req_version rpm is required to build $package", RESET "\n";
+                        print RED "$req_name-$req_version is required to build $package", RESET "\n";
                         $err++;
                     }
                 }
                 else {
-                    print RED "$req_name-$req_version rpm is required to build $package", RESET "\n";
+                    print RED "$req_name-$req_version is required to build $package", RESET "\n";
                     $err++;
                 }
             }