diff options
| author | Simon Rettberg | 2019-02-26 12:26:38 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-02-26 12:26:38 +0100 |
| commit | 0cf5b90ccc9e21b53b040f213a602fe87206a16f (patch) | |
| tree | bd4acf42d9234643a811570d59485c10d2c054d5 /core/modules/run-virt | |
| parent | [rootfs-stage32] Fix bug when using --hdd (diff) | |
| download | mltk-0cf5b90ccc9e21b53b040f213a602fe87206a16f.tar.gz mltk-0cf5b90ccc9e21b53b040f213a602fe87206a16f.tar.xz mltk-0cf5b90ccc9e21b53b040f213a602fe87206a16f.zip | |
[run-virt] SLX_VM_MUTED -> SLX_VM_SOUND
Also don't use 1 and 0 but keywords (enum)
Diffstat (limited to 'core/modules/run-virt')
| -rw-r--r-- | core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc | 10 |
1 files changed, 6 insertions, 4 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 5b58fbb9..d2685c15 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 @@ -95,10 +95,12 @@ setup_virtual_floppy() { # 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]}" + [[ "$SLX_VM_SOUND" = *_ACTIVE ]] && MUTED="0" + # finally, lecture override + if [[ "$SLX_VM_SOUND" != FORCE_* ]]; then + if [ -n "${OPTIONS[SOUNDMUTED]}" ] && [ "${OPTIONS[SOUNDMUTED]}" != -1 ]; then + MUTED="${OPTIONS[SOUNDMUTED]}" + fi fi # Write info file |