From 079ffa40d9683dee8afe474e13c7f72ca576980d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 18 Jun 2013 16:23:56 +0200
Subject: [vmchooser] run-virt.sh: Set volume to 100% instead of 80% on bwPC 4
 [pölkit] Fix replacement of polkitd path in systemd service file

---
 remote/modules/policykit/policykit.build              |  1 +
 .../vmchooser/data/opt/openslx/bin/run-virt.sh        | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/remote/modules/policykit/policykit.build b/remote/modules/policykit/policykit.build
index 591c180f..52be1221 100644
--- a/remote/modules/policykit/policykit.build
+++ b/remote/modules/policykit/policykit.build
@@ -14,6 +14,7 @@ build () {
 }
 
 post_copy() {
+        COPYLIST="$MODULE_DIR/list_dpkg_output"
 	local POLPATH="$(grep '/polkitd$' "$COPYLIST" | head -1 | sed -e 's/[\/&]/\\&/g')"
 	[ -n "$POLPATH" ] && sed -i "s/%%POLKITD%%/${POLPATH}/g" "$TARGET_BUILD_DIR/etc/systemd/system/polkitd.service"
 	#Add Polkit User/Group/Shadow to Stage3.2
diff --git a/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh b/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh
index 6c08653f..84ece685 100755
--- a/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh
+++ b/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh
@@ -376,15 +376,20 @@ writelog "\tVM Hostname:\t\t$hostname"
 ################################################################################
 ### Setup the rest of the environment and run the configured vm
 ################################################################################
-
+# 8086:1e20
+if lspci -n | grep -E -i '8086:1e20( |$)'; then
+	VOL="100%" # bwPC 4: Speaker too quiet :-(
+else
+	VOL="80%"
+fi
 # Adjust sound volume
 #writelog "Unmuting sound...\c "
-amixer -q sset Master 80% unmute 2>/dev/null
-amixer -q sset PCM 80% unmute 2>/dev/null
-amixer -q sset CD 80% unmute 2>/dev/null
-amixer -q sset Headphone 80% unmute 2>/dev/null
-amixer -q sset Front 80% unmute 2>/dev/null      # in SUSE 11.0 it's headphone
-amixer -q sset Speaker 80% unmute 2>/dev/null       # annoying built-in speaker
+amixer -q sset Master "$VOL" unmute 2>/dev/null
+amixer -q sset PCM "$VOL" unmute 2>/dev/null
+amixer -q sset CD "$VOL" unmute 2>/dev/null
+amixer -q sset Headphone "$VOL" unmute 2>/dev/null
+amixer -q sset Front "$VOL" unmute 2>/dev/null      # in SUSE 11.0 it's headphone
+amixer -q sset Speaker "$VOL" unmute 2>/dev/null       # annoying built-in speaker
 #writelog "finished\n"
 
 # Copy guest configuration (with added information) config.xml to be accessed
-- 
cgit v1.2.3-55-g7522