Patchwork nfs-utils: don't try to unload nfsd module

login
register
mail settings
Submitter Andreas Oberritter
Date April 30, 2012, 7:58 p.m.
Message ID <1335815880-7346-1-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/26671/
State Accepted
Commit aba81b64679ec0b1809946cb480e261af47f7625
Headers show

Comments

Andreas Oberritter - April 30, 2012, 7:58 p.m.
* When nfsserver get's stopped, "modprobe -r nfsd" may
  hang indefinitely. As there's no need to unload the
  module, just remove the call to modprobe.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 .../nfs-utils/nfs-utils/nfsserver                  |    8 --------
 .../nfs-utils/nfs-utils_1.2.3.bb                   |    2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)
Saul Wold - May 3, 2012, 8:25 p.m.
On 04/30/2012 12:58 PM, Andreas Oberritter wrote:
> * When nfsserver get's stopped, "modprobe -r nfsd" may
>    hang indefinitely. As there's no need to unload the
>    module, just remove the call to modprobe.
>
> Signed-off-by: Andreas Oberritter<obi@opendreambox.org>
> ---
>   .../nfs-utils/nfs-utils/nfsserver                  |    8 --------
>   .../nfs-utils/nfs-utils_1.2.3.bb                   |    2 +-
>   2 files changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
> index 69c8718..e460e26 100644
> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
> +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
> @@ -105,14 +105,6 @@ stop_nfsd(){
>   	}
>   	then
>   		echo done
> -		# This will remove, recursively, dependencies
> -		echo -n 'removing nfsd kernel module: '
> -		if modprobe -r nfsd
> -		then
> -			echo done
> -		else
> -			echo failed
> -		fi
>   	else
>   		echo failed
>   	fi
> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
> index d047940..eb18aaa 100644
> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
> +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
> @@ -12,7 +12,7 @@ DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers"
>   RDEPENDS_${PN} = "portmap"
>   RRECOMMENDS_${PN} = "kernel-module-nfsd"
>
> -PR = "r3"
> +PR = "r4"
>
>   SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
>              file://nfs-utils-1.0.6-uclibc.patch \

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
index 69c8718..e460e26 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
@@ -105,14 +105,6 @@  stop_nfsd(){
 	}
 	then
 		echo done
-		# This will remove, recursively, dependencies
-		echo -n 'removing nfsd kernel module: '
-		if modprobe -r nfsd
-		then
-			echo done
-		else
-			echo failed
-		fi
 	else
 		echo failed
 	fi
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
index d047940..eb18aaa 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
@@ -12,7 +12,7 @@  DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers"
 RDEPENDS_${PN} = "portmap"
 RRECOMMENDS_${PN} = "kernel-module-nfsd"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
            file://nfs-utils-1.0.6-uclibc.patch \