diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/nfs-utils/Makefile | 2 | ||||
| -rw-r--r-- | package/nfs-utils/files/nfs-utils.postinst | 4 | ||||
| -rw-r--r-- | package/nfs-utils/files/nfs_client.init | 34 | ||||
| -rw-r--r-- | package/nfs-utils/files/nfsd.init (renamed from package/nfs-utils/files/nfs_server.init) | 16 |
4 files changed, 10 insertions, 46 deletions
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 7b7e94b76..d025969e1 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.3.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 3ac3726eda563946d1f44ac3e5b61d56 PKG_DESCR:= network filesystem utilities PKG_SECTION:= net/fs diff --git a/package/nfs-utils/files/nfs-utils.postinst b/package/nfs-utils/files/nfs-utils.postinst index f4b5b5d3a..28b2a12b3 100644 --- a/package/nfs-utils/files/nfs-utils.postinst +++ b/package/nfs-utils/files/nfs-utils.postinst @@ -1,8 +1,6 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh -add_rcconf nfs_server NO -add_rcconf nfs_client NO -add_rcconf nfs_server_version 3 +add_rcconf nfs NO add_service nfs 2049/tcp add_service nfs 2049/udp gid=$(get_next_gid) diff --git a/package/nfs-utils/files/nfs_client.init b/package/nfs-utils/files/nfs_client.init deleted file mode 100644 index 4f4d7d96d..000000000 --- a/package/nfs-utils/files/nfs_client.init +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -#PKG nfs-utils -#INIT 70 -. /etc/rc.conf - -case $1 in -autostop) ;; -autostart) - test x"${rpcbind:-NO}" = x"NO" && exit 0 - test x"${nfs_client:-NO}" = x"NO" && exit 0 - test x"$nfs_client" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start - exec sh $0 start - ;; -start) - mkdir -p /var/lib/nfs/rpc_pipefs - mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs - /usr/sbin/idmapd - /usr/sbin/gssd - ;; -stop) - kill $(pgrep -f /usr/sbin/idmapd) - kill $(pgrep -f /usr/sbin/gssd) - umount /var/lib/nfs/rpc_pipefs - ;; -restart) - sh $0 stop - sh $0 start - ;; -*) - echo "Usage: $0 {start | stop | restart}" - exit 1 - ;; -esac -exit $? diff --git a/package/nfs-utils/files/nfs_server.init b/package/nfs-utils/files/nfsd.init index fddefafc1..e5c8e9531 100644 --- a/package/nfs-utils/files/nfs_server.init +++ b/package/nfs-utils/files/nfsd.init @@ -1,5 +1,5 @@ #!/bin/sh -#PKG nfs-utils +#PKG nfs-utils-server #INIT 70 . /etc/rc.conf @@ -7,16 +7,16 @@ case $1 in autostop) ;; autostart) test x"${rpcbind:-NO}" = x"NO" && exit 0 - test x"${nfs_server:-NO}" = x"NO" && exit 0 - test x"$nfs_server" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start + test x"${nfsd:-NO}" = x"NO" && exit 0 + test x"$nfsd" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start exec sh $0 start ;; start) - /bin/mkdir -p /var/lib/nfs/v4recovery - /bin/touch /var/lib/nfs/rmtab - /bin/touch /var/lib/nfs/etab - /bin/touch /var/lib/nfs/xtab - /bin/touch /var/lib/nfs/sm + mkdir -p /var/lib/nfs/v4recovery + touch /var/lib/nfs/rmtab + touch /var/lib/nfs/etab + touch /var/lib/nfs/xtab + touch /var/lib/nfs/sm chown nfs:nfs /var/lib/nfs/sm /usr/sbin/nfsd /usr/sbin/mountd |