diff options
| author | Jonathan Bauer | 2017-02-15 18:07:28 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2017-02-15 18:07:28 +0100 |
| commit | ec288debb6a1f26c3a5895a66ab79216d8242498 (patch) | |
| tree | 6da3b1fdc08eff64378aa89c4d6a8b73c68944f6 /core/modules | |
| parent | [runvirt] reworked wrapper log handling (diff) | |
| download | mltk-ec288debb6a1f26c3a5895a66ab79216d8242498.tar.gz mltk-ec288debb6a1f26c3a5895a66ab79216d8242498.tar.xz mltk-ec288debb6a1f26c3a5895a66ab79216d8242498.zip | |
[run-virt] missing feature for network shares...
... fallback mechanism...
Diffstat (limited to 'core/modules')
3 files changed, 15 insertions, 10 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_network_shares.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_network_shares.inc index ed47f120..d92ca6ab 100644 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_network_shares.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_network_shares.inc @@ -4,12 +4,12 @@ set_network_shares() { # Add rw share for home dir - homesharepath="${HOME}/PERSISTENT" - homesharename="home" + HOME_SHARE_PATH="${HOME}/PERSISTENT" + HOME_SHARE_NAME="home" # Add common share - commonsharepath="${HOME}/SHARE" - commonsharename="share" + COMMON_SHARE_PATH="${HOME}/SHARE" + COMMON_SHARE_NAME="share" } reg_feature_handler "netshares" "set_network_shares" diff --git a/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc b/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc index 5ab1d6e9..0a935e14 100644 --- a/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc +++ b/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc @@ -97,20 +97,25 @@ setup_usb() { } setup_shared_folders() { + if ! notempty SHARED_FOLDERS HOME_SHARE_PATH HOME_SHARE_NAME COMMON_SHARE_PATH COMMON_SHARE_NAME; then + writelog "Missing information to setup shared folders." + return 1 + fi + cat >> "${TMPCONFIG}" <<-HEREEND sharedFolder.option = "alwaysEnabled" sharedFolder0.present = "$SHARED_FOLDERS" sharedFolder0.enabled = "$SHARED_FOLDERS" sharedFolder0.expiration = "never" - sharedFolder0.guestName = "$homesharename" - sharedFolder0.hostPath = "$homesharepath" + sharedFolder0.guestName = "$HOME_SHARE_NAME" + sharedFolder0.hostPath = "$HOME_SHARE_PATH" sharedFolder0.readAccess = "TRUE" sharedFolder0.writeAccess = "TRUE" sharedFolder1.present = "$SHARED_FOLDERS" sharedFolder1.enabled = "$SHARED_FOLDERS" sharedFolder1.expiration = "never" - sharedFolder1.guestName = "$commonsharename" - sharedFolder1.hostPath = "$commonsharepath" + sharedFolder1.guestName = "$COMMON_SHARE_NAME" + sharedFolder1.hostPath = "$COMMON_SHARE_PATH" sharedFolder1.readAccess = "TRUE" sharedFolder1.writeAccess = "FALSE" sharedFolder.maxNum = "2" @@ -209,7 +214,7 @@ write_final_vmx() { setup_floppies setup_vcpu_ram setup_usb - [ "$HGFS_DISABLED" = "FALSE" ] && setup_shared_folders + [ "x$HGFS_DISABLED" = "xFALSE" ] && setup_shared_folders setup_isolation setup_graphics finalize_hardware diff --git a/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include b/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include index 9d45becf..181ae44c 100644 --- a/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include +++ b/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/run-virt.include @@ -20,7 +20,7 @@ declare -rg VMWARE_INCLUDE_DIR="${VMWARE_PLUGIN_DIR}/includes" # TODO make this part of the metadata coming from the server # Define which features the VMware plugin supports -declare -rg PLUGIN_FEATURES="firewall printer usb slxfloppy sound" +declare -rg PLUGIN_FEATURES="firewall printer usb slxfloppy sound netshares" run_plugin() { # declaration of default functions and variables for vmware |