summaryrefslogtreecommitdiffstats
path: root/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d
diff options
context:
space:
mode:
authorSimon Rettberg2018-11-21 12:23:32 +0100
committerSimon Rettberg2018-11-21 12:23:32 +0100
commitc7ed45225fa986341280ba3e2ebcf7cb9e1f3ee2 (patch)
tree9a190ae127c58b3d74753007644c5481f7a2799b /core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d
parentADD FIRMWAREtqt:QW:Q (diff)
downloadmltk-c7ed45225fa986341280ba3e2ebcf7cb9e1f3ee2.tar.gz
mltk-c7ed45225fa986341280ba3e2ebcf7cb9e1f3ee2.tar.xz
mltk-c7ed45225fa986341280ba3e2ebcf7cb9e1f3ee2.zip
[run-virt] Support lecture-specific sound muting
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d')
-rw-r--r--core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
index ba421191..e2854f77 100644
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
@@ -100,12 +100,12 @@ setup_virtual_floppy() {
fi
## Runscript
+ declare -A OPTIONS
# Check downloaded runscript and handle options like
# extension, visibility flag, ...
# options are 'key=value' pairs separated with ';'
if load_dmsd_resource RUNSCRIPT; then
if [ -s "$RUNSCRIPT" ]; then
- declare -A OPTIONS
IFS=$'\n'
for OPT in $(head -n 1 "$RUNSCRIPT" | tr ";" "\n"); do
KEY=$(cut -s -d '=' -f 1 <<< "${OPT^^}")
@@ -117,8 +117,14 @@ setup_virtual_floppy() {
fi
fi
+ # Default to muted
local MUTED=1
+ # Satellite/location setting can override
[ -n "$SLX_VM_MUTED" ] && [ "$SLX_VM_MUTED" -ge 0 ] && MUTED="$SLX_VM_MUTED"
+ # finally, lecture can override
+ if [ -n "${OPTIONS[SOUNDMUTED]}" ] && [ "${OPTIONS[SOUNDMUTED]}" != -1 ]; then
+ MUTED="${OPTIONS[SOUNDMUTED]}"
+ fi
# Write info file
local UNAME=