Merge pull request #2962 from semik/softflowd

softflowd: update softflowd.init do use procd

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/

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
-}