From c570a6c8f648502a993e5ee6feb5dd447103fcb9 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 1 Oct 2014 18:42:49 +0200
Subject: [vm*] set default sound card for vmware instead of using auto-detect

---
 .../modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'remote/modules/vmware/data')

diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
index ef54218e..90e49445 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
@@ -266,8 +266,8 @@ runvmwareconfheader ()
 		
 		# sound
 		sound.present = "TRUE"
-		sound.fileName = "-1"
-		sound.autodetect = "TRUE"
+		sound.fileName = "sysdefault:CARD=$SOUND_CARD_INDEX"
+		sound.autodetect = "FALSE"
 		sound.virtualdev = "$sound"
 		pciSound.enableVolumeControl = "FALSE"
 		sound.enableVolumeControl = "FALSE"
-- 
cgit v1.2.3-55-g7522


From 419fc802b3a112df96282b1b4c662482978030ca Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 7 Oct 2014 16:22:58 +0200
Subject: [vmchooser/vmware] added support for 2nd shared folder to enable a
 common share folder in the VMs

---
 .../vmchooser/data/opt/openslx/scripts/vmchooser-run_virt   | 10 +++++++---
 .../vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt  | 10 +++++++---
 .../data/opt/openslx/vmchooser/vmware/run-virt.include      | 13 ++++++++++---
 3 files changed, 24 insertions(+), 9 deletions(-)

(limited to 'remote/modules/vmware/data')

diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
index 633f80a2..759b8352 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -419,9 +419,13 @@ remotedesktopport="590${VM_ID}"
 # Enable 3D
 enable3d=$(grep -i -o "<enable3d param=.*" "${xmlfile}" | awk -F '"' '{print $2}' | rv_clean_string)
 
-# Add rw share
-sharepath="${HOME}/PERSISTENT"
-sharename="home"
+# Add rw share for home dir
+homesharepath="${HOME}/PERSISTENT"
+homesharename="home"
+
+# Add common share
+commonsharepath="${HOME}/SHARE"
+commonsharename="share"
 
 # Set hostname: using original hostname and adding string
 hostname="virt-$(hostname)"
diff --git a/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt
index 633f80a2..759b8352 100755
--- a/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt
@@ -419,9 +419,13 @@ remotedesktopport="590${VM_ID}"
 # Enable 3D
 enable3d=$(grep -i -o "<enable3d param=.*" "${xmlfile}" | awk -F '"' '{print $2}' | rv_clean_string)
 
-# Add rw share
-sharepath="${HOME}/PERSISTENT"
-sharename="home"
+# Add rw share for home dir
+homesharepath="${HOME}/PERSISTENT"
+homesharename="home"
+
+# Add common share
+commonsharepath="${HOME}/SHARE"
+commonsharename="share"
 
 # Set hostname: using original hostname and adding string
 hostname="virt-$(hostname)"
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
index 90e49445..016ebdc6 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
@@ -291,11 +291,18 @@ runvmwareconfheader ()
 		sharedFolder0.present = "$shfolders"
 		sharedFolder0.enabled = "$shfolders"
 		sharedFolder0.expiration = "never"
-		sharedFolder0.guestName = "$sharename"
-		sharedFolder0.hostPath = "$sharepath"
+		sharedFolder0.guestName = "$homesharename"
+		sharedFolder0.hostPath = "$homesharepath"
 		sharedFolder0.readAccess = "TRUE"
 		sharedFolder0.writeAccess = "TRUE"
-		sharedFolder.maxNum = "1"
+		sharedFolder1.present = "$shfolders"
+		sharedFolder1.enabled = "$shfolders"
+		sharedFolder1.expiration = "never"
+		sharedFolder1.guestName = "$commonsharename"
+		sharedFolder1.hostPath = "$commonsharepath"
+		sharedFolder1.readAccess = "TRUE"
+		sharedFolder1.writeAccess = "TRUE"
+		sharedFolder.maxNum = "2"
 		
 		# dirs/configs
 		tmpDirectory = "$redodir"
-- 
cgit v1.2.3-55-g7522