[PATCH] Modify tools/setup.sh to be compatible with fedora 21

[PATCH] Modify tools/setup.sh to be compatible with fedora 21

[Daniel Mrzyglod]

From: Daniel Mrzyglod <dtmrzglx-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>

script was expecting /lib/modules/$(uname -r)/kernel/drivers/uio/uio.ko but in fedora 21
there are Compressed kernel modules - xz (LZMA)

Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
 tools/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/setup.sh b/tools/setup.sh
index 369e09e..6a9d23c 100755
--- a/tools/setup.sh
+++ b/tools/setup.sh
@@ -169,7 +169,7 @@ 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
+		if ls /lib/modules/$(uname -r)/kernel/drivers/uio/uio.ko* &> /dev/null; then
 			echo "Loading uio module"
 			sudo /sbin/modprobe uio
 		fi
-- 
2.1.0

Re: [PATCH] Modify tools/setup.sh to be compatible with fedora 21

[Mrzyglod, DanielX T]

Section From: should be 
From: Daniel Mrzyglod <danielx.t.mrzyglod-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>. 

error due to setting fedora 21 alpha on the new machine
> -----Original Message-----
> From: Mrzyglod, DanielX T
> Sent: Wednesday, October 08, 2014 3:12 PM
> To: dev-VfR2kkLFssw@public.gmane.org
> Cc: Daniel Mrzyglod; Mrzyglod, DanielX T
> Subject: [PATCH] Modify tools/setup.sh to be compatible with fedora 21
> 
> From: Daniel Mrzyglod <dtmrzglx-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
> 
> script was expecting /lib/modules/$(uname -r)/kernel/drivers/uio/uio.ko but in
> fedora 21
> there are Compressed kernel modules - xz (LZMA)
> 
> Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> ---
>  tools/setup.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/setup.sh b/tools/setup.sh
> index 369e09e..6a9d23c 100755
> --- a/tools/setup.sh
> +++ b/tools/setup.sh
> @@ -169,7 +169,7 @@ 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
> +		if ls /lib/modules/$(uname -r)/kernel/drivers/uio/uio.ko* &>
> /dev/null; then
>  			echo "Loading uio module"
>  			sudo /sbin/modprobe uio
>  		fi
> --
> 2.1.0

Re: [PATCH] Modify tools/setup.sh to be compatible with fedora 21

[Neil Horman]

On Wed, Oct 08, 2014 at 02:11:31PM +0100, Daniel Mrzyglod wrote:
> From: Daniel Mrzyglod <dtmrzglx-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
> 
> script was expecting /lib/modules/$(uname -r)/kernel/drivers/uio/uio.ko but in fedora 21
> there are Compressed kernel modules - xz (LZMA)
> 
> Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> ---
>  tools/setup.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/setup.sh b/tools/setup.sh
> index 369e09e..6a9d23c 100755
> --- a/tools/setup.sh
> +++ b/tools/setup.sh
> @@ -169,7 +169,7 @@ 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
> +		if ls /lib/modules/$(uname -r)/kernel/drivers/uio/uio.ko* &> /dev/null; then
>  			echo "Loading uio module"
>  			sudo /sbin/modprobe uio
>  		fi
> -- 
> 2.1.0
> 
> 

Just use modinfo uio and test the exit code.  That will make the setup script
agnostic to both filename extension and to kernel version, as modinfo looks in
the running kernel path automatically

Neil