From d6dae7cd0b8ec45df5758fb90d34768a4229d44e Mon Sep 17 00:00:00 2001
From: Sukru Senli <sukru.senli@iopsys.eu>
Date: Wed, 2 Dec 2020 19:42:23 +0100
Subject: [PATCH] icwmp: make wait for service ubus object based

---
 icwmp/files/etc/init.d/icwmpd | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/icwmp/files/etc/init.d/icwmpd b/icwmp/files/etc/init.d/icwmpd
index 9989acc56..5c554f66d 100755
--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -128,17 +128,6 @@ wait_for_option43() {
 	fi
 }
 
-wait_for_wifi() {
-	local time=$1
-	local tm=1
-
-	while [ ! -f /tmp/wifi.started ]; do
-		sleep 1
-		[ $tm -ge $time ] && break
-		tm=$((tm+1))
-	done
-}
-
 wait_for_resolvfile() {
 	local time=$1
 	local tm=1
@@ -153,17 +142,6 @@ wait_for_resolvfile() {
 	done
 }
 
-wait_for_asterisk() {
-	local time=$1
-	local tm=1
-
-	while [ -z "$(pidof asterisk)" ]; do
-		sleep 1
-		[ $tm -ge $time ] && break
-		tm=$((tm+1))
-	done
-}
-
 set_wan_interface() {
 	local l3_device=""
 	local default_wan_interface=""
@@ -183,10 +161,10 @@ start_service() {
 		touch /tmp/.icwmpd_boot
 	else
 		[ -f /sbin/netifd ] && echo "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
-		[ -f /etc/config/wireless ] && echo "Waiting for WiFi to be started ..." && wait_for_wifi 20
+		[ -f /etc/config/wireless ] && echo "Waiting for WiFi to be started ..." && ubus -t 5 wait_for network.wireless
 		[ -f /usr/sbin/dnsmasq ] && echo "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
 		[ -f /etc/config/dhcp ] && echo "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
-		[ -f /usr/sbin/asterisk ] && echo "Waiting for Voice to be started ..." && wait_for_asterisk 5
+		[ -f /usr/sbin/asterisk ] && echo "Waiting for Voice to be started ..." && ubus -t 5 wait_for asterisk
 
 		config_load cwmp
 		build_dmmap_instance