summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-04-30 21:58:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-03 15:48:08 +0100
commitd3e0f1fcda90a249243b2cb1aded00d710359318 (patch)
tree6101f3b155549aefea81f9197f9b241bba03adb0
parentfaf1a72ce3aa76ad50a24745ee698a7e3dca1184 (diff)
downloadpoky-d3e0f1fcda90a249243b2cb1aded00d710359318.tar.gz
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. (From OE-Core rev: aba81b64679ec0b1809946cb480e261af47f7625) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver8
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb2
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 69c871855f..e460e26af0 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(){
105 } 105 }
106 then 106 then
107 echo done 107 echo done
108 # This will remove, recursively, dependencies
109 echo -n 'removing nfsd kernel module: '
110 if modprobe -r nfsd
111 then
112 echo done
113 else
114 echo failed
115 fi
116 else 108 else
117 echo failed 109 echo failed
118 fi 110 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 d047940fd6..eb18aaaa94 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"
12RDEPENDS_${PN} = "portmap" 12RDEPENDS_${PN} = "portmap"
13RRECOMMENDS_${PN} = "kernel-module-nfsd" 13RRECOMMENDS_${PN} = "kernel-module-nfsd"
14 14
15PR = "r3" 15PR = "r4"
16 16
17SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \ 17SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
18 file://nfs-utils-1.0.6-uclibc.patch \ 18 file://nfs-utils-1.0.6-uclibc.patch \