From 37367bdc894b2b6e19b0b999efbb684faaaf1b74 Mon Sep 17 00:00:00 2001 From: Alberto Bursi Date: Sat, 11 Jan 2020 11:40:37 +0100 Subject: [PATCH] minidlna: create UUID in config if it is empty better solution than using a static UUID by default keep the default uuid empty then generate and save a unique UUID on first start of minidlna service. Signed-off-by: Alberto Bursi --- multimedia/minidlna/files/minidlna.config | 2 +- multimedia/minidlna/files/minidlna.init | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/multimedia/minidlna/files/minidlna.config b/multimedia/minidlna/files/minidlna.config index 5c2ea2850b..cdde73ff39 100644 --- a/multimedia/minidlna/files/minidlna.config +++ b/multimedia/minidlna/files/minidlna.config @@ -15,6 +15,6 @@ config minidlna config option serial '12345678' option model_number '1' option root_container '.' - option uuid '019f9a56-ff60-44c0-9edc-eae88d09fa05' + option uuid '' list media_dir '/mnt' option album_art_names 'Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg' diff --git a/multimedia/minidlna/files/minidlna.init b/multimedia/minidlna/files/minidlna.init index 960f28e44c..909b098713 100644 --- a/multimedia/minidlna/files/minidlna.init +++ b/multimedia/minidlna/files/minidlna.init @@ -81,14 +81,18 @@ start() { local db_dir local log_dir local user + local var config_load 'minidlna' config_get_bool enabled config 'enabled' '0' [ "$enabled" -gt 0 ] || return 1 + config_get val "config" uuid + [ "$val" = '' ] && uci set minidlna.config.uuid=$(cat /proc/sys/kernel/random/uuid) && uci commit + minidlna_create_config config || return 1 - + config_get db_dir config 'db_dir' '/var/run/minidlna' config_get log_dir config 'log_dir' '/var/log/minidlna' config_get user config 'user' 'root'