From 27b9fb935083a2ce2899d80f712c8766a5b6f542 Mon Sep 17 00:00:00 2001
From: Markus Gothe <markus.gothe@genexis.eu>
Date: Wed, 30 Jul 2025 21:29:42 +0200
Subject: [PATCH] logmngr: Make sure we never fail to setup /var/log/messages.

If it fails during MP the verfication of buttons will not work
as expected. The problem is that the file is created before
data is commited and when power is cut prematurely it won't
re-create the file, maybe because the uci-default script has
been removed already as well.
---
 logmngr/Makefile                         |  7 ++++---
 logmngr/files/10-logmngr_config_generate | 26 ------------------------
 logmngr/files/logmngr.uci                | 15 ++++++++++++++
 3 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 logmngr/files/10-logmngr_config_generate
 create mode 100644 logmngr/files/logmngr.uci

diff --git a/logmngr/Makefile b/logmngr/Makefile
index 0f9af3cb9..dc7828799 100644
--- a/logmngr/Makefile
+++ b/logmngr/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=logmngr
-PKG_VERSION:=1.0.19
+PKG_VERSION:=1.0.20
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -54,8 +54,8 @@ define Package/logmngr/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/logmngr.init $(1)/etc/init.d/logmngr
 
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/10-logmngr_config_generate $(1)/etc/uci-defaults/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_BIN) ./files/logmngr.uci $(1)/etc/config/logmngr
 
 	$(INSTALL_DIR) $(1)/lib/logmngr
 ifeq ($(CONFIG_LOGMNGR_BACKEND_FLUENTBIT),y)
@@ -68,6 +68,7 @@ ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y)
 endif
 	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfsyslog.so $(1) core 10
 ifeq ($(CONFIG_LOGMNGR_LOGROTATE),y)
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/11-logmngr_logrotate_config_generate $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/logmngr/logrotate.sh $(1)/lib/logmngr/
 	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbflogrotate.so $(1) sysmngr 11
diff --git a/logmngr/files/10-logmngr_config_generate b/logmngr/files/10-logmngr_config_generate
deleted file mode 100644
index 09702e91d..000000000
--- a/logmngr/files/10-logmngr_config_generate
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-if uci -q get logmngr.@globals[0] >/dev/null; then
-	# return if there is any valid content
-	exit 0
-else
-	rm -f /etc/config/logmngr
-fi
-
-touch /etc/config/logmngr
-
-uci set logmngr.globals=globals
-uci set logmngr.globals.enable=1
-
-uci set logmngr.a1=action
-uci set logmngr.a1.name="ac1"
-
-uci set logmngr.lf1=log_file
-uci set logmngr.lf1.enable=1
-uci set logmngr.lf1.action="ac1"
-uci set logmngr.lf1.file="/var/log/messages"
-
-uci set logmngr.lr1=log_remote
-uci set logmngr.lr1.enable=0
-uci set logmngr.lr1.action="ac1"
-uci set logmngr.lr1.port="514"
diff --git a/logmngr/files/logmngr.uci b/logmngr/files/logmngr.uci
new file mode 100644
index 000000000..948ee62c4
--- /dev/null
+++ b/logmngr/files/logmngr.uci
@@ -0,0 +1,15 @@
+config globals 'globals'
+	option enable '1'
+
+config action 'a1'
+	option name 'ac1'
+
+config log_file 'lf1'
+	option enable '1'
+	option action 'ac1'
+	option file '/var/log/messages'
+
+config log_remote 'lr1'
+	option enable '0'
+	option action 'ac1'
+	option port '514'