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

packages/rinetd: use new service functions

SVN-Revision: 29099
---

diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile
index 75d05e394b..9fbb000faf 100755
--- a/net/rinetd/Makefile
+++ b/net/rinetd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rinetd
 PKG_VERSION:=0.62
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=rinetd.tar.gz
 PKG_SOURCE_URL:=http://www.boutell.com/rinetd/http
diff --git a/net/rinetd/files/rinetd.init b/net/rinetd/files/rinetd.init
index 0cb2bbc274..9e1c0b93e6 100755
--- a/net/rinetd/files/rinetd.init
+++ b/net/rinetd/files/rinetd.init
@@ -1,13 +1,9 @@
 #!/bin/sh /etc/rc.common
-# rinetd init script
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2011 OpenWrt.org
 
 START=80
 
-SSD=start-stop-daemon
-BIN=/usr/sbin/rinetd
 CFG=/var/etc/rinetd.conf
-PID=/var/run/rinetd.pid
 
 common_add() {
 	local cfg="$1"
@@ -48,21 +44,21 @@ forward_add() {
 }
 
 start() {
-	mkdir -p /var/etc /var/run
+	mkdir -m 0755 -p /var/etc
+	mkdir -m 0755 -p /var/run
 	
-	echo "# This file is autogenerated, use /etc/config/rinetd" > $CFG
-	config_load rinetd
-	config_foreach common_add common
-	config_foreach forward_add forwarding
+	echo "# This file is autogenerated, check /etc/config/rinetd" > $CFG
+	config_load 'rinetd'
+	config_foreach common_add 'common'
+	config_foreach forward_add 'forwarding'
 
-	$SSD -S -q -x $BIN -- -c $CFG
+	service_start /usr/sbin/rinetd -c $CFG
 }
 
 stop() {
-	$SSD -K -q -p $PID -x $BIN
-	rm -f $PID $CFG
+	service_stop /usr/sbin/rinetd
 }
 
 reload() {
-	$SSD -K -q -p $PID -x $BIN -s 1 
+	service_reload /usr/sbin/rinetd
 }