packages/nfs-server: use new service functions, remove portmap from start/stop (it is in its own initscript)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@29181 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2011-11-16 09:44:29 +00:00
parent 5eac616616
commit 52da85f8aa
2 changed files with 11 additions and 12 deletions

View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nfs-server PKG_NAME:=nfs-server
PKG_VERSION:=2.2beta47 PKG_VERSION:=2.2beta47
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MD5SUM:=79a29fe9f79b2f3241d4915767b8c511
PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/n/nfs-user-server 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_SOURCE:=nfs-user-server_$(PKG_VERSION).orig.tar.gz
PKG_MD5SUM:=79a29fe9f79b2f3241d4915767b8c511
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -30,14 +30,14 @@ define Package/nfs-server/description
User Space NFS server User Space NFS server
endef endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE) -C $(PKG_BUILD_DIR)
endef endef
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
TARGET_LDFLAGS += $(LIBRPC) TARGET_LDFLAGS += $(LIBRPC)
define Package/nfs-server/install define Package/nfs-server/install
$(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/etc
$(INSTALL_DATA) ./files/nfsd.exports $(1)/etc/exports $(INSTALL_DATA) ./files/nfsd.exports $(1)/etc/exports
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d

View File

@ -1,16 +1,15 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006-2011 OpenWrt.org
START=50 START=50
STOP=50 STOP=50
start() { start() {
/usr/sbin/portmap service_start /usr/sbin/rpc.mountd -r
/usr/sbin/rpc.mountd -r service_start /usr/sbin/rpc.nfsd
/usr/sbin/rpc.nfsd
} }
stop() { stop() {
killall rpc.nfsd service_stop /usr/sbin/rpc.nfsd
killall rpc.mountd service_stop /usr/sbin/rpc.mountd -r
killall portmap
} }