From 233d71456468cd6aacb1bb6a511ab1359dbbdcfe Mon Sep 17 00:00:00 2001
From: vdutta <vivek.dutta@iopsys.eu>
Date: Tue, 25 Jan 2022 10:32:05 +0530
Subject: [PATCH] icwmp: Use db device for sn instead of db hw

---
 icwmp/Makefile                                  | 2 +-
 icwmp/files/etc/uci-defaults/85-cwmp-set-userid | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/icwmp/Makefile b/icwmp/Makefile
index 997638f50..a20520c50 100755
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.2.23
+PKG_VERSION:=8.2.24
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
diff --git a/icwmp/files/etc/uci-defaults/85-cwmp-set-userid b/icwmp/files/etc/uci-defaults/85-cwmp-set-userid
index 676ce9d59..471b4a025 100644
--- a/icwmp/files/etc/uci-defaults/85-cwmp-set-userid
+++ b/icwmp/files/etc/uci-defaults/85-cwmp-set-userid
@@ -11,7 +11,7 @@ oui=$(echo ${oui}|tr [a-f] [A-F])
 # Get system serial number.
 serial=$(uci -q get cwmp.cpe.serial_number)
 if [ -z "${serial}" ]; then
-	serial=$(db -q get hw.board.serial_number)
+	serial=$(db -q get device.deviceinfo.SerialNumber)
 fi
 
 # Get userid values