nfs-utils: finetuning startup script

package/base-files/Makefile

@@ -178,8 +178,10 @@ endif
 endif
 	printf "\n" >> ${IDIR_BASE_FILES}/etc/network/interfaces
 
+ifneq (${ADK_SIMPLE_NETWORK_CONFIG_NS},)
 	rm ${IDIR_BASE_FILES}/etc/resolv.conf
 	printf "nameserver ${ADK_SIMPLE_NETWORK_CONFIG_NS}\n" > ${IDIR_BASE_FILES}/etc/resolv.conf
+endif
 ifneq (${ADK_SIMPLE_NETWORK_CONFIG_PROXY},)
 	printf "http_proxy=${ADK_SIMPLE_NETWORK_CONFIG_PROXY}\n" >> ${IDIR_BASE_FILES}/etc/profile
 	printf "https_proxy=${ADK_SIMPLE_NETWORK_CONFIG_PROXY}\n" >> ${IDIR_BASE_FILES}/etc/profile

package/nfs-utils/Makefile

@@ -23,6 +23,7 @@ PKGSD_NFS_UTILS_CLIENT:=client utilities
 PKGSN_NFS_UTILS_CLIENT:=nfs-utils
 PKGSD_NFS_UTILS_SERVER:=server daemons and utilities
 PKGSN_NFS_UTILS_SERVER:=nfs-utils
+PKGSK_NFS_UTILS_SERVER:=nfsd
 
 PKG_CHOICES_NFS_UTILS:=	V3 V4
 PKGCD_V3:=		nfs version 3

package/nfs-utils/files/nfsd.init

@@ -17,6 +17,7 @@ start)
 	touch /var/lib/nfs/etab
 	touch /var/lib/nfs/xtab
 	touch /var/lib/nfs/sm
+	mount -t nfsd nfsd /proc/fs/nfsd
 	chown nfs:nfs /var/lib/nfs/sm
 	/usr/sbin/nfsd 4
 	/usr/sbin/mountd
@@ -30,6 +31,7 @@ start)
 	;;
 stop)
 	kill $(pgrep -f /usr/sbin/mountd)
+	umount /proc/fs/nfsd
 	if [ ${nfs_server_version} -eq 4 ];then
 		kill $(pgrep -f /usr/sbin/idmapd)
 		kill $(pgrep -f /usr/sbin/svcgssd)

scripts/update-rcconf

@@ -44,15 +44,15 @@ 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
+	if [ $rcname = "nfs_utils_server" ];then
 		rcname=nfsd
 	fi
 	if [ $rcname = "openssh_server" ];then
 		rcname=openssh
 	fi
 	if [ $mode = "m" ]; then
-	  sed -i -e "s#^$rcname=\"NO\"#$rcname=\"DAEMON\"#" $rcconf
+	  sed -i "" -e "s#^$rcname=\"NO\"#$rcname=\"DAEMON\"#" $rcconf
 	else
-	  sed -i -e "s#^$rcname=\"NO\"#$rcname=\"YES\"#" $rcconf
+	  sed -i "" -e "s#^$rcname=\"NO\"#$rcname=\"YES\"#" $rcconf
 	fi
 done

target/config/Config.in.runtime

@@ -614,5 +614,3 @@ config ADK_SIMPLE_NETWORK_CONFIG_NS
 config ADK_SIMPLE_NETWORK_CONFIG_PROXY
 	string "HTTP-Proxy (f.e. http://10.0.0.2:8080)"
 	depends on ADK_SIMPLE_NETWORK_CONFIG
-	default ""
-