From: Maximilian Mehnert <maximilian.mehnert@gmx.de>
Date: Sat, 30 Apr 2016 22:04:39 +0000 (+0200)
Subject: p910nd: Convert p910nd init script to procd
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F2648%2Fhead;p=feed%2Fpackages.git

p910nd: Convert p910nd init script to procd

Signed-off-by: Maximilian Mehnert <maximilian.mehnert@gmx.de>
[pkerling@casix.org: increase PKG_RELEASE version]
Signed-off-by: Philipp Kerling <pkerling@casix.org>
---

diff --git a/net/p910nd/Makefile b/net/p910nd/Makefile
index d07ee1ac3a..2cdaaa9fdc 100644
--- a/net/p910nd/Makefile
+++ b/net/p910nd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=p910nd
 PKG_VERSION:=0.97
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/p910nd
diff --git a/net/p910nd/files/p910nd.init b/net/p910nd/files/p910nd.init
index 8757551bf3..f0289036e6 100644
--- a/net/p910nd/files/p910nd.init
+++ b/net/p910nd/files/p910nd.init
@@ -1,6 +1,7 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2007 OpenWrt.org
 START=50
+USE_PROCD=1
 
 append_bool() {
 	local section="$1"
@@ -21,31 +22,24 @@ append_string() {
 }
 
 start_service() {
-	local section="$1"
-	args=""
-
-	append_bool "$section" bidirectional "-b"
-	append_string "$section" device "-f "
-	append_string "$section" bind "-i "
-	append_string "$section" port ""
-	config_get_bool "enabled" "$section" "enabled" '1'
-	[ "$enabled" -gt 0 ] && /usr/sbin/p910nd $args
-}
-
-stop_service() {
-	local section="$1"
-	config_get port "$section" port
-
-	PID_F=/var/run/p910${port}d.pid
-	[ -f $PID_F ] && kill $(cat $PID_F)
-}
-
-start() {
 	config_load "p910nd"
-	config_foreach start_service p910nd
+	config_foreach start_p910nd p910nd
 }
 
-stop() {
-	config_load "p910nd"
-	config_foreach stop_service p910nd
+
+start_p910nd() {
+	local section="$1"
+	config_get_bool "enabled" "$section" "enabled" '1'
+	if [ "$enabled" -gt 0 ]; then
+		args="-d "
+		config_get port "$section" port
+		name=p910${port}d
+		append_bool "$section" bidirectional "-b"
+		append_string "$section" device "-f "
+		append_string "$section" bind "-i "
+		append_string "$section" port ""
+		procd_open_instance $name
+		procd_set_param command /usr/sbin/p910nd $args
+		procd_close_instance
+	fi
 }