diff mbox

[dpdk-dev,v3] Modify tools/setup.sh to be compatible with fedora 21

Message ID 1412935688-16991-1-git-send-email-danielx.t.mrzyglod@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Daniel Mrzyglod Oct. 10, 2014, 10:08 a.m. UTC 
  script was expecting /lib/modules/$(uname -r)/kernel/drivers/uio/uio.ko but in fedora 21
there are Compressed kernel modules - xz (LZMA)

V3 patch: Remove sudo
V2 patch: Use modinfo instead ls
V1 patch: use ls instead checking if specific file exist

Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod@intel.com>
---
 tools/setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Neil Horman Oct. 10, 2014, 11:33 a.m. UTC | #1 
On Fri, Oct 10, 2014 at 11:08:08AM +0100, Daniel Mrzyglod wrote:
> script was expecting /lib/modules/$(uname -r)/kernel/drivers/uio/uio.ko but in fedora 21
> there are Compressed kernel modules - xz (LZMA)
> 
> V3 patch: Remove sudo
> V2 patch: Use modinfo instead ls
> V1 patch: use ls instead checking if specific file exist
> 
> Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod@intel.com>
> ---
>  tools/setup.sh | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/setup.sh b/tools/setup.sh
> index 369e09e..14e319c 100755
> --- a/tools/setup.sh
> +++ b/tools/setup.sh
> @@ -169,7 +169,8 @@ load_igb_uio_module()
>  
>  	/sbin/lsmod | grep -s uio > /dev/null
>  	if [ $? -ne 0 ] ; then
> -		if [ -f /lib/modules/$(uname -r)/kernel/drivers/uio/uio.ko ] ; then
> +		modinfo uio > /dev/null
> +		if [ $? -eq 0 ]; then
>  			echo "Loading uio module"
>  			sudo /sbin/modprobe uio
>  		fi
> -- 
> 2.1.0
> 
> 
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Thomas Monjalon Oct. 10, 2014, 3:58 p.m. UTC | #2 
> > script was expecting /lib/modules/$(uname -r)/kernel/drivers/uio/uio.ko but in fedora 21
> > there are Compressed kernel modules - xz (LZMA)
> > 
> > V3 patch: Remove sudo
> > V2 patch: Use modinfo instead ls
> > V1 patch: use ls instead checking if specific file exist
> > 
> > Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod@intel.com>
> 
> Acked-by: Neil Horman <nhorman@tuxdriver.com>

Applied

Thanks
diff mbox

Patch

diff --git a/tools/setup.sh b/tools/setup.sh
index 369e09e..14e319c 100755
--- a/tools/setup.sh
+++ b/tools/setup.sh
@@ -169,7 +169,8 @@  load_igb_uio_module()
 
 	/sbin/lsmod | grep -s uio > /dev/null
 	if [ $? -ne 0 ] ; then
-		if [ -f /lib/modules/$(uname -r)/kernel/drivers/uio/uio.ko ] ; then
+		modinfo uio > /dev/null
+		if [ $? -eq 0 ]; then
 			echo "Loading uio module"
 			sudo /sbin/modprobe uio
 		fi