nfs-utils: fix wrong startup scripts

3 files changed, 4 insertions, 49 deletions

diff --git a/package/nfs-utils/files/nfs-utils-server.init b/package/nfs-utils/files/nfs-utils-server.init
deleted file mode 100644
index a864c5430..000000000
--- a/package/nfs-utils/files/nfs-utils-server.init
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-#PKG nfs-utils-server
-#INIT 70
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
-	test x"${rpcbind:-NO}" = x"NO" && exit 0
-	test x"${nfs_utils_server:-NO}" = x"NO" && exit 0
-	test x"$nfs_utils_server" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
-	exec sh $0 start
-	;;
-start)
-	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 4
-	/usr/sbin/mountd
-	exportfs -a
-	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
-		/usr/sbin/idmapd
-		/usr/sbin/svcgssd
-	fi
-	;;
-stop)
-	kill $(pgrep -f /usr/sbin/mountd)
-	if [ ${nfs_server_version} -eq 4 ];then
-		kill $(pgrep -f /usr/sbin/idmapd)
-		kill $(pgrep -f /usr/sbin/svcgssd)
-		umount /var/lib/nfs/rpc_pipefs
-	fi
-	;;
-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-utils-server.postinst b/package/nfs-utils/files/nfs-utils-server.postinst
index 93532983a..5c762993e 100644
--- a/package/nfs-utils/files/nfs-utils-server.postinst
+++ b/package/nfs-utils/files/nfs-utils-server.postinst
@@ -1,4 +1,4 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-add_rcconf nfs_utils_server NO
+add_rcconf nfsd NO
 add_rcconf nfs_server_version 3
diff --git a/scripts/update-rcconf b/scripts/update-rcconf
index fcaeb7d63..ce9662c85 100755
--- a/scripts/update-rcconf
+++ b/scripts/update-rcconf
@@ -44,6 +44,9 @@ for service in $(grep ^ADK_RUNTIME_START_ $topdir/.config |grep -v ADK_RUNTIME_S
 	if [ $rcname = "iptables" ];then
 		rcname=firewall
 	fi
+	if [ $rcname = "nfs-utils-server" ];then
+		rcname=nfsd
+	fi
 	if [ $rcname = "openssh_server" ];then
 		rcname=openssh
 	fi