From 0cf5b90ccc9e21b53b040f213a602fe87206a16f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 26 Feb 2019 12:26:38 +0100
Subject: [run-virt] SLX_VM_MUTED -> SLX_VM_SOUND

Also don't use 1 and 0 but keywords (enum)
---
 .../opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'core/modules/run-virt/data/opt/openslx/vmchooser')

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
-- 
cgit v1.2.3-55-g7522