From d9fe7d6927f3b26bd0bad72fa03dc864b84f0308 Mon Sep 17 00:00:00 2001
From: Amin Ben Romdhane <amin.benromdhane@iopsys.eu>
Date: Tue, 5 Dec 2023 11:35:44 +0100
Subject: [PATCH] icwmp: Option to keep config with '1 Firmware Upgrade Image'

---
 icwmp/Makefile                | 4 ++--
 icwmp/files/etc/config/cwmp   | 1 +
 icwmp/files/etc/init.d/icwmpd | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/icwmp/Makefile b/icwmp/Makefile
index a9c355808..98c9f1d1d 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.5.23
+PKG_VERSION:=9.5.24
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=35228b84fbb4349ef22ef9f18b2cc19e97a8b43f
+PKG_SOURCE_VERSION:=5c1970e571624df029069741f7259ffd47b1ba06
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
diff --git a/icwmp/files/etc/config/cwmp b/icwmp/files/etc/config/cwmp
index b4a13e86f..7deff0564 100644
--- a/icwmp/files/etc/config/cwmp
+++ b/icwmp/files/etc/config/cwmp
@@ -39,6 +39,7 @@ config cpe 'cpe'
 	option incoming_rule 'Port_Only'
 	option active_notif_throttle '0'
 	option disable_gatewayinfo '0'
+	option keep_settings '1'
 	
 config lwn 'lwn'
 	option enable '0'
diff --git a/icwmp/files/etc/init.d/icwmpd b/icwmp/files/etc/init.d/icwmpd
index 4d1cfc3d2..dfe50cec7 100755
--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -437,7 +437,8 @@ validate_cpe_section()
 		'exec_download:bool' \
 		'periodic_notify_enable:bool' \
 		'enable:bool' \
-		'periodic_notify_interval:uinteger'
+		'periodic_notify_interval:uinteger' \
+		'keep_settings:bool'
 }
 
 validate_defaults() {