softflowd: update softflowd.init to use procd

Signed-off-by: Jan Tomasek <jan@tomasek.cz>

diff --git a/net/softflowd/Makefile b/net/softflowd/Makefile
index a908d3150e68de4e90b3eb6203414beb6056c994..aa45787f677b9967a96d8b0952797aebb0b33fd1 100644 (file)
--- a/net/softflowd/Makefile
+++ b/net/softflowd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=softflowd
 PKG_VERSION:=0.9.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://softflowd.googlecode.com/files/

diff --git a/net/softflowd/files/softflowd.init b/net/softflowd/files/softflowd.init
index a4956c3508c8c6b4e5aed9355cf04688dfbe4d28..98b4e349431568fb7a34bbe4f0843cf45fe82e00 100755 (executable)
--- a/net/softflowd/files/softflowd.init
+++ b/net/softflowd/files/softflowd.init
@@ -1,6 +1,7 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2007-2011 OpenWrt.org
 
+USE_PROCD=1
 START=50
 
 append_bool() {
@@ -43,32 +44,15 @@ start_instance() {
        append_string "$section" 'sampling_rate' '-s'
        append_bool "$section" track_ipv6 '-6'
 
-       SERVICE_PID_FILE="$pid_file" \
-       service_start /usr/sbin/softflowd $args${pid_file:+ -p $pid_file}
+       procd_open_instance
+       procd_set_param command /usr/sbin/softflowd -d $args${pid_file:+ -p $pid_file}
+       procd_set_param respawn
+       procd_close_instance
 }
 
-stop_instance() {
-       local section="$1"
-
-       config_get_bool enabled "$section" 'enabled' '0'
-       [ $enabled -gt 0 ] || return 1
-
-       config_get control_socket "$section" 'control_socket'
-
-       [ -n "control_socket" -a -S $control_socket ] && {
-               /usr/sbin/softflowctl -c $control_socket exit
-       }
-}
-
-start() {
-       mkdir -m 0755 -p /var/empty
+start_service() {
+        mkdir -m 0755 -p /var/empty
 
        config_load 'softflowd'
        config_foreach start_instance 'softflowd'
 }
-
-stop() {
-       config_load 'softflowd'
-       config_foreach stop_instance 'softflowd'
-       service_stop /usr/sbin/softflowd
-}