summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2014-10-07 16:22:58 +0200
committerJonathan Bauer2014-10-07 16:22:58 +0200
commit419fc802b3a112df96282b1b4c662482978030ca (patch)
treed359dfc5013898a31585f32f50fef72aef4fbe59
parent[pam-common-share] dummy module with pam-script file to mount a common share (diff)
downloadtm-scripts-419fc802b3a112df96282b1b4c662482978030ca.tar.gz
tm-scripts-419fc802b3a112df96282b1b4c662482978030ca.tar.xz
tm-scripts-419fc802b3a112df96282b1b4c662482978030ca.zip
[vmchooser/vmware] added support for 2nd shared folder to enable a common share folder in the VMs
-rwxr-xr-xremote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt10
-rwxr-xr-xremote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt10
-rw-r--r--remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include13
3 files changed, 24 insertions, 9 deletions
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"