From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 14 Nov 2011 02:38:44 +0000 (+0000)
Subject: packages/stun: use new service functions
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=540f9e681271cfe0abf0a33dec4f4306a3187398;p=openwrt%2Fsvn-archive%2Farchive.git

packages/stun: use new service functions

SVN-Revision: 29095
---

diff --git a/net/stun/Makefile b/net/stun/Makefile
index b0ac419df2..b4897144e5 100644
--- a/net/stun/Makefile
+++ b/net/stun/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stund
 PKG_VERSION:=0.96
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_Aug13.tgz
 PKG_SOURCE_URL:=@SF/stun
diff --git a/net/stun/files/stund.init b/net/stun/files/stund.init
index 177ae58f52..1deada499f 100644
--- a/net/stun/files/stund.init
+++ b/net/stun/files/stund.init
@@ -3,26 +3,28 @@
 
 START=70
 
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+
 start() {
 	local pri_ip sec_ip pri_port sec_port
+
 	parse_opts() {
 		local cfg="$1"
-		config_get pri_ip   "$cfg" primaryip
-		config_get sec_ip   "$cfg" secondaryip
-		config_get pri_port "$cfg" primaryport
-		config_get sec_port "$cfg" secondaryport
+		config_get pri_ip   "$cfg" 'primaryip'
+		config_get sec_ip   "$cfg" 'secondaryip'
+		config_get pri_port "$cfg" 'primaryport'
+		config_get sec_port "$cfg" 'secondaryport'
 	}
 
-	config_load "stund"
+	config_load 'stund'
 	config_foreach parse_opts
 
-	start-stop-daemon -S -p /var/run/stund.pid -m -b \
-		-x /usr/sbin/stund -- \
+	service_start /usr/sbin/stund \
 		${pri_ip:+-h $pri_ip} ${sec_ip:+-a $sec_ip} \
 		${pri_port:+-p $pri_port} ${sec_port:+-o $sec_port}
 }
 
 stop() {
-	service_kill stund /var/run/stund.pid
-	rm -f /var/run/stund.pid
+	service_stop /usr/sbin/stund
 }