From: Jerin Jacob <jerin.jacob@caviumnetworks.com>
Date: Mon, 14 Mar 2016 12:15:32 +0000 (+0530)
Subject: tools: fix setup with built-in kernel modules
X-Git-Tag: spdx-start~7217
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=4e72892c3367b9fcff70868c29d1e9236ee57d04;p=dpdk.git

tools: fix setup with built-in kernel modules

probe the kernel module existence through /sys/module/ to make it work
with both module and inbuilt kernel module

Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
---

diff --git a/tools/setup.sh b/tools/setup.sh
index b290b87634..6097ab7bfd 100755
--- a/tools/setup.sh
+++ b/tools/setup.sh
@@ -427,7 +427,7 @@ grep_meminfo()
 #
 show_nics()
 {
-	if  /sbin/lsmod | grep -q -e igb_uio -e vfio_pci; then
+	if [ -d /sys/module/vfio_pci -o -d /sys/module/igb_uio ]; then
 		${RTE_SDK}/tools/dpdk_nic_bind.py --status
 	else
 		echo "# Please load the 'igb_uio' or 'vfio-pci' kernel module before "
@@ -440,7 +440,7 @@ show_nics()
 #
 bind_nics_to_vfio()
 {
-	if /sbin/lsmod  | grep -q vfio_pci ; then
+	if [ -d /sys/module/vfio_pci ]; then
 		${RTE_SDK}/tools/dpdk_nic_bind.py --status
 		echo ""
 		echo -n "Enter PCI address of device to bind to VFIO driver: "
@@ -458,7 +458,7 @@ bind_nics_to_vfio()
 #
 bind_nics_to_igb_uio()
 {
-	if  /sbin/lsmod  | grep -q igb_uio ; then
+	if [ -d /sys/module/igb_uio ]; then
 		${RTE_SDK}/tools/dpdk_nic_bind.py --status
 		echo ""
 		echo -n "Enter PCI address of device to bind to IGB UIO driver: "