diff options
| author | Christian Rößler | 2018-11-29 16:42:39 +0100 |
|---|---|---|
| committer | Christian Rößler | 2018-11-29 16:42:39 +0100 |
| commit | 54bbd6a755b4411a9fcff1ecd5221a4469a52219 (patch) | |
| tree | 0f4354da55819abdcafee1b5f62dae485ee9e315 /core/modules/run-virt/data/opt/openslx/vmchooser | |
| parent | [run-virt] Linux scripts some changes: Desktop links, permiss. etc (diff) | |
| parent | [run-virt] Support lecture-specific sound muting (diff) | |
| download | mltk-54bbd6a755b4411a9fcff1ecd5221a4469a52219.tar.gz mltk-54bbd6a755b4411a9fcff1ecd5221a4469a52219.tar.xz mltk-54bbd6a755b4411a9fcff1ecd5221a4469a52219.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/mltk
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser')
| -rw-r--r-- | core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc | 8 |
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= |