From 7e1a6806c74bb638db54d693807ef71ef162ae5e Mon Sep 17 00:00:00 2001
From: crim50n <crims0n@ya.ru>
Date: Mon, 6 Dec 2021 19:25:08 +0300
Subject: [PATCH] fix

---
 linux-live/module_scripts/03-mediaplayer/install     |  6 +++---
 .../rootcopy-install/usr/bin/mediaplayer             | 12 +++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/linux-live/module_scripts/03-mediaplayer/install b/linux-live/module_scripts/03-mediaplayer/install
index e94780a..3cbf333 100644
--- a/linux-live/module_scripts/03-mediaplayer/install
+++ b/linux-live/module_scripts/03-mediaplayer/install
@@ -70,9 +70,9 @@ x11vnc_password=P1ayMyVide0
 samba_password=P1ayMyVide0
 vlc_password=P1ayMyVide0
 nextcloud_password=P1ayMyVide0
-media_source="mediasource"
-playing_source="playingsource"
-local_source="localsource"
+media_source="/mediasource"
+playing_source="/playingsource"
+local_source="/localsource"
 local_source_label="LOCALSOURCE"
 vlc_name=cvlc
 vlc_options=" -f -R --no-video-title --extraintf=http --http-password $vlc_password"
diff --git a/linux-live/module_scripts/03-mediaplayer/rootcopy-install/usr/bin/mediaplayer b/linux-live/module_scripts/03-mediaplayer/rootcopy-install/usr/bin/mediaplayer
index ec13b5e..b50c1db 100644
--- a/linux-live/module_scripts/03-mediaplayer/rootcopy-install/usr/bin/mediaplayer
+++ b/linux-live/module_scripts/03-mediaplayer/rootcopy-install/usr/bin/mediaplayer
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. /etc/minios/config
+
 function read_cmdline() {
     for i in $@; do
         case $i in
@@ -19,16 +21,12 @@ function read_cmdline() {
     done
 }
 
-media_source="/mediasource"
-playing_source="/playingsource"
-local_source="/localsource"
-
 if [ -f /run/initramfs/memory/toram/mediaplayer.config ]; then
     . /run/initramfs/memory/toram/mediaplayer.config
     cp /run/initramfs/memory/toram/mediaplayer.config /mediaplayer.config
-elif [ -f /run/initramfs/memory/data/minios/mediaplayer.config ]; then
-    . /run/initramfs/memory/data/minios/mediaplayer.config
-    cp /run/initramfs/memory/data/minios/mediaplayer.config /mediaplayer.config
+elif [ -f /run/initramfs/memory/data/$LIVEKITNAME/mediaplayer.config ]; then
+    . /run/initramfs/memory/data/$LIVEKITNAME/mediaplayer.config
+    cp /run/initramfs/memory/data/$LIVEKITNAME/mediaplayer.config /mediaplayer.config
 else
     . /mediaplayer.config
 fi