[oe-commits] Andreas Oberritter : nfs-utils: don't try to unload nfsd module

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: e4646c407324d40a1a90cf86f1471800adf5431e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e4646c407324d40a1a90cf86f1471800adf5431e

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Mon Apr 30 21:58:00 2012 +0200

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

* 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 at opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../nfs-utils/nfs-utils/nfsserver                  |    8 --------
 .../nfs-utils/nfs-utils_1.2.3.bb                   |    2 +-
 2 files changed, 1 insertions(+), 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 \