From 63779cf56e293574fdeb8993c3eddf32b4eb46e3 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Wed, 5 Nov 2025 15:46:26 +0530
Subject: [PATCH] icwmp: fix copy_config usages

(cherry picked from commit d1d57ca528fbb2f77114c5c258ee6a10f904332b)
---
 icwmp/Makefile                |  2 +-
 icwmp/files/etc/config/cwmp   |  6 +++---
 icwmp/files/etc/init.d/icwmpd | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/icwmp/Makefile b/icwmp/Makefile
index 73a380316..fb7d22678 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.9.9.7
+PKG_VERSION:=9.9.9.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
diff --git a/icwmp/files/etc/config/cwmp b/icwmp/files/etc/config/cwmp
index 28d7cb91d..c68e53935 100644
--- a/icwmp/files/etc/config/cwmp
+++ b/icwmp/files/etc/config/cwmp
@@ -43,9 +43,9 @@ config cpe 'cpe'
 	option periodic_notify_interval '10'
 	option incoming_rule 'Port_Only'
 	option active_notif_throttle '0'
-	option KeepConfig '1'
-	option KeepOpConf '1'
-	option ConfigScope 'UserOnly'
+	#option KeepConfig '1'
+	#option KeepOpConf '1'
+	#option ConfigScope 'UserOnly'
 	option clock_sync_timeout '128'
 	option disable_datatype_check '0'
 	#list allowed_cr_ip '10.5.1.0/24'
diff --git a/icwmp/files/etc/init.d/icwmpd b/icwmp/files/etc/init.d/icwmpd
index 2d2e620b8..e825c628e 100755
--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -97,9 +97,9 @@ validate_cpe_section()
 		'periodic_notify_enable:bool' \
 		'enable:bool:1' \
 		'periodic_notify_interval:uinteger' \
-		'KeepConfig:bool:1' \
-		'KeepOpConf:bool:1' \
-		'ConfigScope:string:"UserOnly"'
+		'KeepConfig:bool' \
+		'KeepOpConf:bool' \
+		'ConfigScope:string'
 }
 
 validate_defaults() {
@@ -180,9 +180,9 @@ stop_service()
 		ConfigScope="$(uci -q get cwmp.cpe.ConfigScope)"
 
 		json_init
-		[ -n "${KeepConfig}" ] && json_add_boolean "KeepConfig" "${KeepConfig}"
-		[ -n "${KeepOpConf}" ] && json_add_boolean "KeepOpConf" "${KeepOpConf}"
-		[ -n "${ConfigScope}" ] && json_add_string "ConfigScope" "${ConfigScope}"
+		[ -n "${KeepConfig}" ] && json_add_boolean "keep_config" "${KeepConfig}"
+		[ -n "${KeepOpConf}" ] && json_add_boolean "keep_opconf" "${KeepOpConf}"
+		[ -n "${ConfigScope}" ] && json_add_string "config_scope" "${ConfigScope}"
 
 		json_dump| /etc/sysmngr/fwbank call copy_config
 	fi