LU-18871 dkms: prefer 'command -v' over 'which'

Prefer command -v over which to quash spurious output during
dkms build.

Test-Parameters: trivial testgroup=full-dkms
HPE-bug-id: LUS-12801
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: I63494f0bbb16c5dff85fcac2e8cb9c141c38bdd2
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/58594
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Alexander Zarochentsev <alexander.zarochentsev@hpe.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/config/lustre-lnet.m4 b/config/lustre-lnet.m4
index 9722556..e1a3231 100644 (file)
--- a/config/lustre-lnet.m4
+++ b/config/lustre-lnet.m4
@@ -80,7 +80,7 @@ case $with_o2ib in
        yes)    INT_O2IBPATHS="$LINUX $LINUX/drivers/infiniband"
                BUILT_IN_KO2IBLND="yes"
                # Use ofed_info to find external driver
-               AS_IF([which ofed_info 2>/dev/null], [
+               AS_IF([command -v ofed_info >/dev/null], [
                        AS_IF([test x$uses_dpkg = xyes], [
                                LSPKG="dpkg --listfiles"
                        ], [

diff --git a/debian/dkms.conf.in b/debian/dkms.conf.in
index bb52124..0297cc3 100644 (file)
--- a/debian/dkms.conf.in
+++ b/debian/dkms.conf.in
@@ -127,7 +127,7 @@ elif [[ -f $o2ib ]] ; then
    ext_mofed=yes
 else
    # could be either, ext_ofed will be preferred by default
-   if which ofed_info >/dev/null ; then
+   if command -v ofed_info >/dev/null ; then
       pkgs="mlnx-ofed-kernel-dkms|mlnx-ofed-kernel-modules|mlnx-ofa_kernel-devel"
       pkgs="${pkgs}|compat-rdma-devel|kernel-ib-devel|ofa_kernel-devel"
       paths=$(dpkg -l | awk '{print $2}' |

diff --git a/lustre/scripts/dkms.mkconf b/lustre/scripts/dkms.mkconf
index d4cad76..875f6a8 100755 (executable)
--- a/lustre/scripts/dkms.mkconf
+++ b/lustre/scripts/dkms.mkconf
@@ -92,7 +92,7 @@ elif [[ -f \$o2ib ]] ; then
    ext_mofed=yes
 else
    # could be either, ext_ofed will be preferred by default
-   if which ofed_info >/dev/null ; then
+   if command -v ofed_info >/dev/null ; then
       pkgs="mlnx-ofed-kernel-dkms|mlnx-ofed-kernel-modules|mlnx-ofa_kernel-devel"
       pkgs="\${pkgs}|compat-rdma-devel|kernel-ib-devel|ofa_kernel-devel"
       paths=\$(rpm -qa |