From c1722a8acb2b4246ef926e043e328ad9914299e6 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Wed, 4 Mar 2009 17:07:00 +0200 Subject: [PATCH] hca_self_test: fix lspci output parsing Signed-off-by: Mohammad Sawalha Signed-off-by: Vladimir Sokolovsky --- hca_self_test.ofed | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hca_self_test.ofed b/hca_self_test.ofed index 7581724..181de1c 100755 --- a/hca_self_test.ofed +++ b/hca_self_test.ofed @@ -132,7 +132,7 @@ if [ $OS_TYPE = "DEBIAN" ]; then else # RPM check RPM_CHECK_FAIL=0 - RPM_USR_VER=`rpm -qa 2> /dev/null | grep kernel-ib | wc -l ` + RPM_USR_VER=`rpm -qa 2> /dev/null | grep kernel-ib | wc -l` RPM_KER_VER=`rpm -qa 2> /dev/null | grep kernel-ib | wc -l` RPM_KER_NAME=`rpm -qa 2> /dev/null | grep kernel-ib | grep -v devel | sed s/kernel-ib-//g | tr \\\n " "` @@ -196,8 +196,8 @@ fi function get_device_id { loop_cnt=$1 - PCI_DEV=$(lspci 2> /dev/null | grep Mellanox | head -$(expr $loop_cnt + 1) | tail -1 | awk '{print $1}') - HexDevice_ID=$(lspci -n -d "15b3:" 2> /dev/null | head -$(expr $loop_cnt + 1) | tail -1 | cut -d ":" -f4 | cut -d " " -f1) + PCI_DEV=$(lspci 2> /dev/null | grep -E "(InfiniBand|Memory controller): Mellanox Technolog" | head -$(expr $loop_cnt + 1) | tail -1 | awk '{print $1}') + HexDevice_ID=$(lspci -n -d "15b3:" 2> /dev/null | grep $PCI_DEV | tail -1 | cut -d ":" -f4 | cut -d " " -f1) if [ "$HexDevice_ID" != "" ]; then HexDevice_ID=0x$HexDevice_ID -- 2.46.0