From e0a6b7906a437cd3a9d089ea3c2f9bb538783040 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 22 Jun 2020 10:11:23 +0200 Subject: [PATCH] minidlna: restore service triggers Restore service triggers which got wrongly removed in commit 733aae9584ef92c327b9008142602a7e69cfec3b ("fix issues"). Without triggers, changing settings from LuCI or calling reload_config from the cli won't have any effect. Also adjust the uci commit call to only commit the minidlna configuration when setting a UUID, to avoid committing unrelated user changes in other config files. Ref: https://github.com/openwrt/luci/issues/4194 Fixes: 733aae958 ("minidlna: fix issues") Fixes: 37367bdc8 ("minidlna: create UUID in config if it is empty") Signed-off-by: Jo-Philipp Wich --- multimedia/minidlna/Makefile | 2 +- multimedia/minidlna/files/minidlna.init | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile index fb69aa4f9f..b701fcaaf9 100644 --- a/multimedia/minidlna/Makefile +++ b/multimedia/minidlna/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=minidlna -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.code.sf.net/p/minidlna/git diff --git a/multimedia/minidlna/files/minidlna.init b/multimedia/minidlna/files/minidlna.init index 27baa47ff2..326dc2a0e7 100644 --- a/multimedia/minidlna/files/minidlna.init +++ b/multimedia/minidlna/files/minidlna.init @@ -83,7 +83,7 @@ start_service() { [ "$enabled" -gt 0 ] || return 1 config_get val "config" uuid - [ "$val" = '' ] && uci set minidlna.config.uuid="$(cat /proc/sys/kernel/random/uuid)" && uci commit + [ "$val" = '' ] && uci set minidlna.config.uuid="$(cat /proc/sys/kernel/random/uuid)" && uci commit minidlna minidlna_create_config config || return 1 @@ -103,3 +103,7 @@ start_service() { procd_set_param respawn procd_close_instance } + +service_triggers() { + procd_add_reload_trigger "minidlna" +}