From d094459645b4548979cae873d516b030201d5e7a Mon Sep 17 00:00:00 2001
From: Sukru Senli <sukru.senli@inteno.se>
Date: Sun, 3 May 2015 15:33:03 +0200
Subject: [PATCH] BB: hook voice_client and asterisk to procd

---
 asterisk-1.8.x-mod/files/asterisk.init        | 26 ++++++++---------
 voice-client/files/etc/init.d/voice_client    |  8 +++--
 .../files/etc/uci-defaults/voice_client       | 29 -------------------
 3 files changed, 18 insertions(+), 45 deletions(-)
 delete mode 100755 voice-client/files/etc/uci-defaults/voice_client

diff --git a/asterisk-1.8.x-mod/files/asterisk.init b/asterisk-1.8.x-mod/files/asterisk.init
index 19db121d9..77dca6e9a 100644
--- a/asterisk-1.8.x-mod/files/asterisk.init
+++ b/asterisk-1.8.x-mod/files/asterisk.init
@@ -3,11 +3,13 @@
 START=98
 STOP=10
 
+USE_PROCD=1
+
 DEST=
 DEFAULT=$DEST/etc/default/asterisk
 OPTIONS=""
 
-asterisk_boot() {
+asterisk_start() {
 	[ -f $DEFAULT ] && . $DEFAULT
 	[ -d $DEST/var/run/asterisk ] || mkdir -p $DEST/var/run/asterisk
 	[ -d $DEST/var/log/asterisk ] || mkdir -p $DEST/var/log/asterisk
@@ -24,28 +26,26 @@ asterisk_boot() {
 	$DEST/usr/sbin/asterisk $OPTIONS
 }
 
-asterisk_restart() {
+asterisk_reload() {
 	asterisk -rx "core reload"
 	asterisk -rx "dialplan reload"
 	asterisk -rx "brcm reload"
 	echo  "asterisk reloaded"
 }
 
-boot()
-{
-	asterisk_boot
+service_triggers() {
+        procd_add_reload_trigger voice_client
 }
 
-start() {
-	asterisk_boot
-	restart
+start_service() {
+	asterisk_start
 }
 
-stop() {
-	[ -f $DEST/var/run/asterisk/asterisk.pid ]
+reload_service() {
+	asterisk_reload
+}
+
+stop_service() {
         echo 'stopping asterisk'
 }
 
-restart() {
-	asterisk_restart
-}
diff --git a/voice-client/files/etc/init.d/voice_client b/voice-client/files/etc/init.d/voice_client
index b034cdf35..7a504aaf3 100755
--- a/voice-client/files/etc/init.d/voice_client
+++ b/voice-client/files/etc/init.d/voice_client
@@ -12,6 +12,7 @@ if [ -f "$HOOKS" ] ; then
 fi
 
 START=60
+USE_PROCD=1
 
 # Some global variables
 SERIAL=$(cat /proc/nvram/SerialNumber)
@@ -1967,7 +1968,7 @@ configure_logger()
 	sed -i "s/|SYSLOG_FACILITY|/$syslog_facility/"	$WORKDIR/logger.tmp
 }
 
-start() {
+start_service() {
 	run_hook preinit
 	mkdir -p $WORKDIR
 	mkdir -p $WORKDIR/ssl
@@ -2086,6 +2087,7 @@ start() {
 	return
 }
 
-restart() {
-	start
+service_triggers() {
+        procd_add_reload_trigger voice_client
 }
+
diff --git a/voice-client/files/etc/uci-defaults/voice_client b/voice-client/files/etc/uci-defaults/voice_client
deleted file mode 100755
index 5b673c430..000000000
--- a/voice-client/files/etc/uci-defaults/voice_client
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Part of luci-app-voice.
-# This file adds dependencies to /etc/config/ucitrack to allow uci to
-# 1. recreate asterisk configuration files
-# 2. restart asterisk
-# whenever a user applies settings in the luci UI
-#
-# This file should be placed in /etc/uci-defaults/ on installation of
-# the luci-app-voice-client. It will then be executed (once) by uci
-# on the following reboot.
-#
-
-uci -q batch <<-EOF >/dev/null
-	delete ucitrack.@asterisk[-1]
-	add ucitrack asterisk
-	set ucitrack.@asterisk[-1].init=asterisk
-	commit ucitrack
-EOF
-
-uci -q batch <<-EOF >/dev/null
-	delete ucitrack.@voice_client[-1]
-	add ucitrack voice_client
-	set ucitrack.@voice_client[-1].init=voice_client
-	add_list ucitrack.@voice_client[-1].affects=asterisk
-	commit ucitrack
-EOF
-
-exit