From dd22c6ca12d117753748633b06df15c12cc0445b Mon Sep 17 00:00:00 2001
From: Sukru Senli <sukru.senli@iopsys.eu>
Date: Wed, 7 Oct 2020 13:57:53 +0200
Subject: [PATCH] icwmp: remove unnecessary parts from init script

---
 icwmp/files/etc/init.d/icwmpd | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/icwmp/files/etc/init.d/icwmpd b/icwmp/files/etc/init.d/icwmpd
index 915af32ea..4f78dee9e 100755
--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -10,7 +10,6 @@ STOP=10
 
 USE_PROCD=1
 PROG="/usr/sbin/icwmpd"
-PROG098="/usr/sbin/icwmp_tr098d"
 
 EXTRA_COMMANDS="notify"
 EXTRA_HELP="	start	[GetRPCMethods] Start icwmpd service and send GetRPCMethods"
@@ -196,11 +195,7 @@ start_service() {
 		get_acs_url
 
 		procd_open_instance
-		if [ "$(uci -q get cwmp.cpe.datamodel)" == "tr098" ]; then
-			procd_set_param command "$PROG098"
-		else
-			procd_set_param command "$PROG"
-		fi
+		procd_set_param command "$PROG"
 		if [ "$1" = "GetRPCMethods" ];then
 			procd_append_param command -g
 		elif [ -f /etc/icwmpd/.icwmpd_boot ]; then
@@ -208,11 +203,9 @@ start_service() {
 		fi
 		procd_set_param respawn "3" "7" "0"
 		procd_close_instance
-		procd_open_instance
-			if [ "$(uci -q get cwmp.cpe.notification)" == "1" ]; then                                                  
-			        procd_append_param command "/usr/sbin/icwmp_notifd"                                 
-			fi
-		procd_close_instance
+		#procd_open_instance
+		#[ "$(uci -q get cwmp.cpe.notification)" == "1" ] && procd_append_param command "/usr/sbin/icwmp_notifd"
+		#procd_close_instance
 	fi
 }
 
@@ -229,7 +222,6 @@ service_triggers() {
 	procd_add_config_trigger "config.change" "cwmp"  /etc/init.d/icwmpd reload
         if [ "$(uci -q get cwmp.cpe.notification)" == "1" ]; then
 		for conf in $(ls /etc/config/); do
-			[ "$conf" == "cwmp" ] && continue
 			procd_add_config_trigger "config.change" "$conf" /etc/init.d/icwmpd notify
 		done
 	fi