update for mediaplayer to play not in RAM

linux-live/buildconfig

@@ -6,15 +6,15 @@ DISTRIBUTION_TYPE=debian
 
 # distribution
 # дистрибутив
-DISTRIBUTION=stretch
+DISTRIBUTION=buster
 
 # distribution arch
 # архитектура дистрибутива
-DISTRIBUTION_ARCH=i386
+DISTRIBUTION_ARCH=amd64
 
 # окружение рабочего стола
 # desktop environment
-DESKTOP_ENVIRONMENT=slax
+DESKTOP_ENVIRONMENT=mediaplayer
 
 # system variant, indicates the used list of packages in modules
 # вариант системы, указывает на используемый список пакетов в модулях

linux-live/module_scripts/03-mediaplayer/install

@@ -70,15 +70,17 @@ x11vnc_password=P1ayMyVide0
 samba_password=P1ayMyVide0
 vlc_password=P1ayMyVide0
 nextcloud_password=P1ayMyVide0
-media_source="/mediasource"
+media_source="mediasource"
-playing_source="/playingsource"
+playing_source="playingsource"
-local_source="/localsource"
+local_source="localsource"
 local_source_label="LOCALSOURCE"
 vlc_name=cvlc
 vlc_options=" -f -R --no-video-title --extraintf=http --http-password $vlc_password"
 play_pause=1
 EOF
 
+chmod +x /usr/bin/mediaplayer
+
 systemctl disable smbd
 systemctl disable x11vnc
 systemctl disable novnc

linux-live/module_scripts/03-mediaplayer/rootcopy-install/usr/bin/mediaplayer

@@ -4,35 +4,11 @@ function read_cmdline() {
     for i in $@; do
         case $i in
         user_name=*)
-            USER_NAME="${i#*=}"
+            user_name="${i#*=}"
             shift # past argument=value
             ;;
-        user_password=*)
+        playlocally)
-            USER_PASSWORD="${i#*=}"
+            playlocally=true
-            shift # past argument=value
-            ;;
-        root_password=*)
-            ROOT_PASSWORD="${i#*=}"
-            shift # past argument=value
-            ;;
-        host_name=*)
-            HOST_NAME="${i#*=}"
-            shift # past argument=value
-            ;;
-        default_target=*)
-            DEFAULT_TARGET="${i#*=}"
-            shift # past argument=value
-            ;;
-        ssh)
-            SSH=true
-            shift # past argument with no value
-            ;;
-        ssh_key=*)
-            SSH_KEY="${i#*=}"
-            shift # past argument=value
-            ;;
-        cloud)
-            CLOUD=true
             shift # past argument with no value
             ;;
         *)
@@ -43,6 +19,10 @@ 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
@@ -55,40 +35,62 @@ fi
 
 read_cmdline /proc/cmdline
 
+if [ $user_name = "root" ]; then
+    user_name=guest
+fi
+
 sudo x11vnc -storepasswd "$x11vnc_password" /etc/x11vnc.pass >/dev/null 2>&1
-echo -e "$samba_password\n$samba_password" | (sudo smbpasswd -a -s $USER_NAME)
+echo -e "$samba_password\n$samba_password" | (sudo smbpasswd -a -s $user_name)
 sudo systemctl restart ssh
 sudo systemctl restart x11vnc
 sudo systemctl restart novnc
 sudo systemctl restart smbd
+
+if [ $playlocally = "true" ]; then
+    if mount -L $local_source_label /mnt >/dev/null 2>&1; then
+        media_source=/mnt$media_source
+        playing_source=/mnt$playing_source
+        local_source=/mnt
+        local_mounted="true"
+    fi
+fi
+
 if [ ! -d "$media_source" ]; then
     sudo mkdir -p $media_source
-    sudo chown $USER_NAME:$USER_NAME $media_source
+    sudo chown $user_name:$user_name $media_source
 fi
 if [ ! -d "$playing_source" ]; then
     sudo mkdir -p $playing_source
-    sudo chown $USER_NAME:$USER_NAME $playing_source
+    sudo chown $user_name:$user_name $playing_source
 fi
 if [ ! -d "$local_source" ]; then
     sudo mkdir -p $local_source
-    sudo chown $USER_NAME:$USER_NAME $local_source
+    sudo chown $user_name:$user_name $local_source
 fi
 if [ ! -d "/tmp/mediaplayer" ]; then
     sudo mkdir -p /tmp/mediaplayer
-    sudo chown $USER_NAME:$USER_NAME /tmp/mediaplayer
+    sudo chown $user_name:$user_name /tmp/mediaplayer
+fi
+
+if [ $playlocally != "true" ]; then
+    if mount -L $local_source_label $local_source ] >/dev/null 2>&1; then
+        local_mounted="true"
+    fi
 fi
-if mount -L $local_source_label $local_source >/dev/null 2>&1; then
+
+if [ $local_mounted = "true" ]; then
     if [ ! -d "$local_source/media" ]; then
         sudo mkdir -p "$local_source/media"
-        sudo chown $USER_NAME:$USER_NAME "$local_source/media"
+        sudo chown $user_name:$user_name "$local_source/media"
         sudo mkdir -p "$local_source/mediaplayer"
-        sudo chown $USER_NAME:$USER_NAME "$local_source/mediaplayer"
+        sudo chown $user_name:$user_name "$local_source/mediaplayer"
     fi
     if [ -f "$local_source/mediaplayer/lastplayed" ]; then
         cp $(cat $local_source/mediaplayer/lastplayed) $playing_source/
         cp $local_source/mediaplayer/lastplayed /tmp/mediaplayer/lastplayed
     fi
 fi
+
 if [ -f "/tmp/mediaplayer/lastplayed" ]; then
     /usr/bin/$vlc_name $vlc_options $(cat /tmp/mediaplayer/lastplayed) >/dev/null 2>&1 &
 fi

linux-live/modules/mediaplayer/01-firmware

@@ -0,0 +1 @@
+../../module_scripts/01-firmware

linux-live/modules/mediaplayer/02-xorg

@@ -0,0 +1 @@
+../../module_scripts/02-xorg

linux-live/modules/mediaplayer/03-mediaplayer

@@ -0,0 +1 @@
+../../module_scripts/03-mediaplayer