From d21c3f33b6b72730d36945d0195fc91ce5142986 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Sun, 10 Mar 2024 12:00:47 +0530
Subject: [PATCH] bulkdata: Align with bbfdm micro_service

---
 bulkdata/Makefile                                         | 2 +-
 bulkdata/files/etc/init.d/bulkdatad                       | 5 -----
 .../etc/uci-defaults/50_add_bulkdata_dm_microservice      | 8 ++++++++
 3 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 bulkdata/files/etc/uci-defaults/50_add_bulkdata_dm_microservice

diff --git a/bulkdata/Makefile b/bulkdata/Makefile
index 211822aa1..b9658eb53 100755
--- a/bulkdata/Makefile
+++ b/bulkdata/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.5
+PKG_VERSION:=2.1.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
diff --git a/bulkdata/files/etc/init.d/bulkdatad b/bulkdata/files/etc/init.d/bulkdatad
index cc87107c8..b3d7e5044 100755
--- a/bulkdata/files/etc/init.d/bulkdatad
+++ b/bulkdata/files/etc/init.d/bulkdatad
@@ -3,11 +3,8 @@
 START=60
 STOP=10
 
-. /etc/bbfdm/bbfdm_services.sh
-
 USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
-BULKDATA_JSON_INPUT="/etc/bulkdata/input.json"
 
 start_service() {
 	local enable
@@ -21,8 +18,6 @@ start_service() {
 		procd_set_param respawn
 		procd_close_instance "bulkdata"
 	}
-
-	bbfdm_add_service "bbfdm.bulkdata" "${BULKDATA_JSON_INPUT}"
 }
 
 reload_service() {
diff --git a/bulkdata/files/etc/uci-defaults/50_add_bulkdata_dm_microservice b/bulkdata/files/etc/uci-defaults/50_add_bulkdata_dm_microservice
new file mode 100644
index 000000000..3ad374303
--- /dev/null
+++ b/bulkdata/files/etc/uci-defaults/50_add_bulkdata_dm_microservice
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if ! uci -q get bbfdm.bulkdata >/dev/null; then
+	uci set bbfdm.bulkdata=micro_service
+	uci set bbfdm.bulkdata.enable=1
+	uci set bbfdm.bulkdata.input_json="/etc/bulkdata/input.json"
+	uci set bbfdm.bulkdata.loglevel=1
+fi