Browse Source

minidlna: restore service triggers

Restore service triggers which got wrongly removed in commit
733aae9584 ("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 <jo@mein.io>
lilik-openwrt-22.03
Jo-Philipp Wich 4 years ago
parent
commit
e0a6b7906a
2 changed files with 6 additions and 2 deletions
  1. +1
    -1
      multimedia/minidlna/Makefile
  2. +5
    -1
      multimedia/minidlna/files/minidlna.init

+ 1
- 1
multimedia/minidlna/Makefile View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=minidlna PKG_NAME:=minidlna
PKG_RELEASE:=6
PKG_RELEASE:=7
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.code.sf.net/p/minidlna/git PKG_SOURCE_URL:=https://git.code.sf.net/p/minidlna/git


+ 5
- 1
multimedia/minidlna/files/minidlna.init View File

@ -83,7 +83,7 @@ start_service() {
[ "$enabled" -gt 0 ] || return 1 [ "$enabled" -gt 0 ] || return 1
config_get val "config" uuid 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 minidlna_create_config config || return 1
@ -103,3 +103,7 @@ start_service() {
procd_set_param respawn procd_set_param respawn
procd_close_instance procd_close_instance
} }
service_triggers() {
procd_add_reload_trigger "minidlna"
}

Loading…
Cancel
Save