diff options
Diffstat (limited to 'package/nfs-utils')
| -rw-r--r-- | package/nfs-utils/Makefile | 17 | ||||
| -rw-r--r-- | package/nfs-utils/files/nfsd.init | 6 |
2 files changed, 13 insertions, 10 deletions
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 3d55b6260..1d6e9aa23 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -5,21 +5,26 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils PKG_VERSION:= 1.2.3 -PKG_RELEASE:= 3 +PKG_RELEASE:= 5 PKG_MD5SUM:= 1131dc5f27c4f3905a6e7ee0d594fd4d PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net/fs -PKG_DEPENDS:= kmod-nfsd portmap +PKG_DEPENDS:= kmod-nfsd PKG_URL:= http://sourceforge.net/projects/nfs PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} -PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS WITH_TIRPC +PKG_CHOICES_NFS_UTILS:= WITH_TIRPC WITHOUT_TIRPC +PKGCD_WITH_TIRPC:= enable Transport Independent RPC +PKGCS_WITH_TIRPC:= libtirpc rpcbind +PKGCB_WITH_TIRPC:= libtirpc rpcbind +PKGCD_WITHOUT_TIRPC:= disable Transport Independent RPC +PKGCS_WITHOUT_TIRPC:= portmap +PKGCB_WITHOUT_TIRPC:= portmap + +PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS PKGFD_WITH_KERBEROS:= enable Kerberos support (MIT) PKGFS_WITH_KERBEROS:= libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue PKGFB_WITH_KERBEROS:= libnfsidmap krb5 libevent libgssglue librpcsecgss -PKGFD_WITH_TIRPC:= enable Transport Independent RPC -PKGFS_WITH_TIRPC:= libtirpc rpcbind -PKGFB_WITH_TIRPC:= libtirpc rpcbind DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 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) |