[run-virt] Linux scripts: Sound vol. to 100%, if unmuted

1 files changed, 16 insertions, 7 deletions

diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc
index 4e44e076..5b69d90c 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc
@@ -1,4 +1,6 @@
 ### Variablen #####################################
+
+##### User related#################
 LOCALUSER=student
 USERHOME=/home/"$LOCALUSER"
 USERHOMEDIR=/home/"$LOCALUSER"/PERSISTENT
@@ -6,6 +8,8 @@ USERDESKTOP=$(su -c - $LOCALUSER "xdg-user-dir DESKTOP")
 [ "$USERDESKTOP" == "" ] && USERDESKTOP="$USERHOME"
 USERLOGFILE="$USERDESKTOP"/openslx.log
 
+
+##### Mounting, network, PW #######
 DISKMOUNTDIR=/mnt/diskmount
 SLXCONFIGFILE="$DISKMOUNTDIR"/openslx.ini
 CONFIGFILE="$DISKMOUNTDIR"/shares.dat
@@ -20,26 +24,31 @@ if [ ! $(mount 2>/dev/null | grep -q "$DISKMOUNTDIR") ]; then
 	mount /dev/fd1 "$DISKMOUNTDIR" 2>/dev/null 1>&2		# Zu erl.: Fehlerfangen
 fi
 
+# CIFSVERSIONS="3.11 3.0 2.1 2.0 1.0"
+CIFSVERSIONS="3.0 2.1 1.0 3.11 2.0"
+MOUNTCIFSPRAE="-v -t cifs -o "
+MOUNTCIFSOPTS="uid=$(id --user "$LOCALUSER"),gid=$(id --group "$LOCALUSER"),forceuid,forcegid,file_mode=0700,dir_mode=0700,nobrl,noacl"
+MOUNTNFSPRAE="-v -t nfs4 -o "
+MOUNTNFSOPTS="rw,nosuid,nodev,nolock,intr,hard,sloppy"
+
 NATADDR=$(head -n 1 "$CONFIGFILE" | cut -f 1 -d$'\t')
 PORT=$(head -n 1 "$CONFIGFILE" | cut -f 2 -d$'\t')
 SCHLUESSEL=$(head -n 1 "$CONFIGFILE" | cut -f 4 -d$'\t')
 GLOBALDOMAINUSER=$(head -n 1 "$CONFIGFILE" | cut -f 5 -d$'\t')
 GLOBALUSER=$(echo "$GLOBALDOMAINUSER" | cut -d '\' -f 2)
 
+##### Remap #######################
 REMAPMODE=$(grep '^remapMode=' "$SLXCONFIGFILE" | cut -d '=' -f 2)
 CREATEMISSING=$(grep '^createMissingRemap=' "$SLXCONFIGFILE" | cut -d '=' -f 2)
 
+##### Script (Autostart ) #########
 SCRIPTUSER=$(grep '^scriptUser=' "$SLXCONFIGFILE" | cut -d '=' -f 2)
 SCRIPTVISIBILITY=$(grep '^scriptVisibility=' "$SLXCONFIGFILE" | cut -d '=' -f 2)
 SCRIPTEXT=$(grep scriptExt "$DISKMOUNTDIR/openslx.ini" | cut -f 2 -d "=")
-MUTESOUND=$(grep muteSound "$DISKMOUNTDIR/openslx.ini" | cut -f 2 -d "=")
 
-# CIFSVERSIONS="3.11 3.0 2.1 2.0 1.0"
-CIFSVERSIONS="3.0 2.1 1.0 3.11 2.0"
+##### Sound #######################
+MUTESOUND=$(grep muteSound "$DISKMOUNTDIR/openslx.ini" | cut -f 2 -d "=")
+SOUNDVOL="100%"
 
-MOUNTCIFSPRAE="-v -t cifs -o "
-MOUNTCIFSOPTS="uid=$(id --user "$LOCALUSER"),gid=$(id --group "$LOCALUSER"),forceuid,forcegid,file_mode=0700,dir_mode=0700,nobrl,noacl"
 
-MOUNTNFSPRAE="-v -t nfs4 -o "
-MOUNTNFSOPTS="rw,nosuid,nodev,nolock,intr,hard,sloppy"
 ### Variablen Ende ################################