From 657199ad3aebbd9811ba0117ed8c9cff48658e5d Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 15:42:04 +0000
Subject: [PATCH] nfs-server: merge r29181, r29199

SVN-Revision: 30228
---
 net/nfs-server/Makefile        | 14 +++++++++-----
 net/nfs-server/files/nfsd.init | 13 ++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/net/nfs-server/Makefile b/net/nfs-server/Makefile
index 6338b1bb2..6257fdfab 100644
--- a/net/nfs-server/Makefile
+++ b/net/nfs-server/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nfs-server
 PKG_VERSION:=2.2beta47
-PKG_RELEASE:=1
-PKG_MD5SUM:=79a29fe9f79b2f3241d4915767b8c511
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/n/nfs-user-server
 PKG_SOURCE:=nfs-user-server_$(PKG_VERSION).orig.tar.gz
+PKG_MD5SUM:=79a29fe9f79b2f3241d4915767b8c511
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -30,14 +30,14 @@ define Package/nfs-server/description
 User Space NFS server
 endef
 
-define Build/Compile	
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)
 endef
 
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
 TARGET_LDFLAGS += $(LIBRPC)
 
-define Package/nfs-server/install	
+define Package/nfs-server/install
 	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_DATA) ./files/nfsd.exports $(1)/etc/exports
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -46,4 +46,8 @@ define Package/nfs-server/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rpc.* $(1)/usr/sbin/
 endef
 
+define Package/nfs-server/conffiles
+/etc/exports
+endef
+
 $(eval $(call BuildPackage,nfs-server))
diff --git a/net/nfs-server/files/nfsd.init b/net/nfs-server/files/nfsd.init
index 183441c55..f66c1af25 100644
--- a/net/nfs-server/files/nfsd.init
+++ b/net/nfs-server/files/nfsd.init
@@ -1,16 +1,15 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 STOP=50
 
 start() {
-	/usr/sbin/portmap
-	/usr/sbin/rpc.mountd -r
-	/usr/sbin/rpc.nfsd
+	service_start /usr/sbin/rpc.mountd -r
+	service_start /usr/sbin/rpc.nfsd
 }
 
 stop() {
-	killall rpc.nfsd
-	killall rpc.mountd
-	killall portmap
+	service_stop /usr/sbin/rpc.nfsd
+	service_stop /usr/sbin/rpc.mountd -r
 }
-- 
2.30.2