Changeset 29181

Timestamp:

2011-11-16T10:44:29+01:00 (6 years ago)

Author:

nico

Message:

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

Location:

packages/net/nfs-server

Files:

• Makefile (modified) (4 diffs)
• files/nfsd.init (modified) (1 diff)

packages/net/nfs-server/Makefile

@@ -1 +1 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -10 +10 @@
 PKG_NAME:=nfs-server
 PKG_VERSION:=2.2beta47
-PKG_RELEASE:=1
-PKG_MD5SUM:=79a29fe9f79b2f3241d4915767b8c511
+PKG_RELEASE:=2
 
 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
@@ -31 +31 @@
 endef
 
-define Build/Compile    
+define Build/Compile
         $(MAKE) -C $(PKG_BUILD_DIR)
 endef
@@ -38 +38 @@
 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

packages/net/nfs-server/files/nfsd.init

@@ -1 +1 @@
 #!/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
 }