From 8bdfd3ea51a81941ee9c53a46a66cf6c0f6eb88f Mon Sep 17 00:00:00 2001
From: Amin Ben Romdhane <amin.benromdhane@iopsys.eu>
Date: Mon, 10 Jul 2023 16:29:47 +0200
Subject: [PATCH] bulkdata: 2.1.1

---
 bulkdata/Makefile                      |  8 ++++----
 bulkdata/files/etc/bulkdata/input.json | 15 +++++++++++++++
 bulkdata/files/etc/init.d/bulkdatad    | 11 ++++++++---
 3 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100755 bulkdata/files/etc/bulkdata/input.json

diff --git a/bulkdata/Makefile b/bulkdata/Makefile
index eadbfa389..370d5e691 100755
--- a/bulkdata/Makefile
+++ b/bulkdata/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.1.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -43,9 +43,9 @@ endif
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/json
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/	
+	$(INSTALL_DIR) $(1)/etc/bulkdata
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bulkdata
 	$(CP) ./files/* $(1)/
 endef
 
diff --git a/bulkdata/files/etc/bulkdata/input.json b/bulkdata/files/etc/bulkdata/input.json
new file mode 100755
index 000000000..6d468c741
--- /dev/null
+++ b/bulkdata/files/etc/bulkdata/input.json
@@ -0,0 +1,15 @@
+{
+	"daemon": {
+		"input": {
+			"type": "JSON",
+			"name": "/etc/bulkdata/bulkdata.json"
+		},
+		"output": {
+			"type": "UBUS",
+			"name": "bbfdm.bulkdata",
+			"parent_dm": "Device.",
+			"object": "BulkData",
+			"root_obj": "bbfdm"
+		}
+	}
+}
\ No newline at end of file
diff --git a/bulkdata/files/etc/init.d/bulkdatad b/bulkdata/files/etc/init.d/bulkdatad
index d9ad8435b..f4665fc1f 100755
--- a/bulkdata/files/etc/init.d/bulkdatad
+++ b/bulkdata/files/etc/init.d/bulkdatad
@@ -3,8 +3,11 @@
 START=99
 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
@@ -12,12 +15,14 @@ start_service() {
 	config_load bulkdata
 	config_get_bool enable bulkdata enable 1
 
-	procd_open_instance bulkdata
 	[ "$enable" -eq "1" ] && {
+		procd_open_instance "bulkdata"
 		procd_set_param command "$PROG"
-		procd_set_param respawn "3" "7" "0"
+		procd_set_param respawn
+		procd_close_instance "bulkdata"
 	}
-	procd_close_instance
+
+	bbfdm_add_service "bbfdm.bulkdata" "${BULKDATA_JSON_INPUT}"
 }
 
 reload_service() {