diff options
| author | Simon Rettberg | 2016-03-18 15:05:56 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-03-18 15:05:56 +0100 |
| commit | 240c4b062a4e8bf9e76fbee5217646385a4caa58 (patch) | |
| tree | 02d630952c97359eebd967aa88c0897e5a405973 /remote/modules/vmware | |
| parent | [run-virt] More progress on openslx.exe (diff) | |
| download | tm-scripts-240c4b062a4e8bf9e76fbee5217646385a4caa58.tar.gz tm-scripts-240c4b062a4e8bf9e76fbee5217646385a4caa58.tar.xz tm-scripts-240c4b062a4e8bf9e76fbee5217646385a4caa58.zip | |
[run-virt/vmware] Error messages if mounting in win fails, fallback logic
Diffstat (limited to 'remote/modules/vmware')
3 files changed, 8 insertions, 4 deletions
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc index 5d33ce16..b9e998ea 100644 --- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc @@ -172,10 +172,12 @@ real_core_count="$cpu_cores" # to a different value than the virtual number of cores per virtual CPU. cores_per_socket="$cpu_cores" -if [ "x$shfolders" != "xFALSE" ]; then +if [ "x$shfolders" != "xFALSE" ] && [ "$SHARE_REMAP_MODE" != 1 ]; then ENABLE_SHARE='sharedFolder.option = "alwaysEnabled"' + HGFS_DISABLED="FALSE" else ENABLE_SHARE='' + HGFS_DISABLED="TRUE" fi [ "$mem" -ge "$MAXMEM" ] && mem="$MAXMEM" diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc index 7418a053..7332c79a 100644 --- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc @@ -159,10 +159,12 @@ create_vmware_config_file_legacy() { # to a different value than the virtual number of cores per virtual CPU. cores_per_socket="$cpu_cores" - if [ "x$shfolders" != "xFALSE" ]; then + if [ "x$shfolders" != "xFALSE" ] && [ "$SHARE_REMAP_MODE" != 1 ]; then ENABLE_SHARE='sharedFolder.option = "alwaysEnabled"' + HGFS_DISABLED="FALSE" else ENABLE_SHARE='' + HGFS_DISABLED="TRUE" fi [ "$mem" -ge "$MAXMEM" ] && mem="$MAXMEM" @@ -293,7 +295,7 @@ create_vmware_config_file_legacy() { mainMem.useNamedFile = "TRUE" snapshot.disabled = "TRUE" tools.syncTime = "TRUE" - isolation.tools.hgfs.disable = "FALSE" + isolation.tools.hgfs.disable = "$HGFS_DISABLED" hgfs.mapRootShare = "TRUE" isolation.tools.dnd.disable = "FALSE" isolation.tools.copy.enable = "TRUE" diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc index cdc2710c..a8136513 100644 --- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc @@ -97,7 +97,7 @@ HEREEND # Isolation tools: settings # It should be verified whether and when entries necessary cat >> "$TMPDIR/$IMGUUID" <<-HEREEND -isolation.tools.hgfs.disable = "FALSE" +isolation.tools.hgfs.disable = "$HGFS_DISABLED" isolation.tools.dnd.disable = "FALSE" isolation.tools.copy.enable = "TRUE" isolation.tools.paste.enabled = "TRUE" |