diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-27 22:23:42 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-27 22:23:42 +0100 |
| commit | fe9fcae3c7674d2c7c2df3be9640629e294d2eaf (patch) | |
| tree | 4a3a078efe151e59110649e81377f8d6fd9cde0b /package/nfs-utils | |
| parent | 49d42a7d9128f0b29bbfdb6e2c0a5b5480d4b8bc (diff) | |
fix startup scripts, nfsd is not killable (kernel thread)
Diffstat (limited to 'package/nfs-utils')
| -rw-r--r-- | package/nfs-utils/Makefile | 2 | ||||
| -rw-r--r-- | package/nfs-utils/files/nfsd.init | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index a62547095..1d6e9aa23 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils PKG_VERSION:= 1.2.3 -PKG_RELEASE:= 4 +PKG_RELEASE:= 5 PKG_MD5SUM:= 1131dc5f27c4f3905a6e7ee0d594fd4d PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net/fs diff --git a/package/nfs-utils/files/nfsd.init b/package/nfs-utils/files/nfsd.init index 55dbd1c04..26be81aa8 100644 --- a/package/nfs-utils/files/nfsd.init +++ b/package/nfs-utils/files/nfsd.init @@ -7,7 +7,7 @@ case $1 in autostop) ;; autostart) - test x"${portmap:-NO}" = x"NO" && exit 0 + test x"${portmap:-NO}" = x"NO" || test x"${rpcbind:-NO}" = x"NO" && exit 0 test x"${nfs_server:-NO}" = x"NO" && exit 0 exec sh $0 start ;; @@ -18,9 +18,8 @@ start) /bin/touch /var/lib/nfs/xtab /bin/touch /var/lib/nfs/sm chown nfs:nfs /var/lib/nfs/sm - /usr/sbin/exportfs -r - /usr/sbin/mountd /usr/sbin/nfsd + /usr/sbin/mountd if [ ${nfs_server_version} -eq 4 ];then mkdir -p /var/lib/nfs/rpc_pipefs mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs @@ -29,7 +28,6 @@ start) fi ;; stop) - kill $(pgrep -f /usr/sbin/nfsd) kill $(pgrep -f /usr/sbin/mountd) if [ ${nfs_server_version} -eq 4 ];then kill $(pgrep -f /usr/sbin/idmapd) |