[runvirt], [vmware] Some more cosmetics: now include directories

31 files changed, 2 insertions, 2 deletions

diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/check_lpd.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_lpd.inc
index 8286bbaa..8286bbaa 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/check_lpd.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_lpd.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/check_runvirt_needed_files.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_runvirt_needed_files.inc
index fbb0bc70..fbb0bc70 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/check_runvirt_needed_files.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_runvirt_needed_files.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/check_runvirt_xml_sanity_legacy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_runvirt_xml_sanity_legacy.inc
index d331e1af..d331e1af 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/check_runvirt_xml_sanity_legacy.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_runvirt_xml_sanity_legacy.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/detect_legacy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/detect_legacy.inc
index 13670bb1..13670bb1 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/detect_legacy.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/detect_legacy.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/get_xml_file_dir_legacy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_dir_legacy.inc
index c3c6f7b3..c3c6f7b3 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/get_xml_file_dir_legacy.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_dir_legacy.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/get_xml_file_variables.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables.inc
index 90d59beb..90d59beb 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/get_xml_file_variables.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/get_xml_file_variables_legacy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables_legacy.inc
index 3fdc06d2..3fdc06d2 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/get_xml_file_variables_legacy.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables_legacy.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/print_runvirt_console_logo.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/print_runvirt_console_logo.inc
index 649cf956..649cf956 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/print_runvirt_console_logo.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/print_runvirt_console_logo.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/set_runvirt_hardware_variables.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_hardware_variables.inc
index 400c1bf4..400c1bf4 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/set_runvirt_hardware_variables.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_hardware_variables.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/set_runvirt_hardware_variables_legacy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_hardware_variables_legacy.inc
index 0da5e2be..0da5e2be 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/set_runvirt_hardware_variables_legacy.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_hardware_variables_legacy.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/set_runvirt_variables.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_variables.inc
index 9525a290..9525a290 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/set_runvirt_variables.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_variables.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/setup_image_access.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc
index 9e0caa5e..9e0caa5e 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/setup_image_access.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/setup_printer_lpd.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_printer_lpd.inc
index 425ae9d9..425ae9d9 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/setup_printer_lpd.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_printer_lpd.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/setup_sound.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_sound.inc
index 7b505474..7b505474 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/setup_sound.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_sound.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/setup_virtual_floppy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
index 4b8e10aa..4b8e10aa 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/setup_virtual_floppy.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/setup_vm_hypervisor.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_vm_hypervisor.inc
index b7bb8f01..b7bb8f01 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/setup_vm_hypervisor.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_vm_hypervisor.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/start_pvs.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/start_pvs.inc
index 90cd237b..90cd237b 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/start_pvs.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/start_pvs.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/start_windowmanager.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/start_windowmanager.inc
index a3149c24..a3149c24 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/start_windowmanager.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/start_windowmanager.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser_runvirt_functions.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/vmchooser_runvirt_functions.inc
index 7b64653c..7b64653c 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser_runvirt_functions.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/vmchooser_runvirt_functions.inc
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt
index 43c21453..7d83844e 100755
--- a/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt
@@ -19,7 +19,7 @@
 #      fied virtualization tool.
 ################################################################################
 
-RUNVIRTINCLUDEDIR=/opt/openslx/scripts/
+RUNVIRTINCLUDEDIR=/opt/openslx/scripts/includes
 xmlfile="$1"
 
 # Functions needed by vmchooser-run_virt (writelog(), cleanexit(), rv_clean_string())
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/create_vmhome_preferences_file.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc
index a5f2cbee..a5f2cbee 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/create_vmhome_preferences_file.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/create_vmware_config_file.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc
index bac61be6..bac61be6 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/create_vmware_config_file.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/create_vmware_config_file_legacy.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc
index 1d6b2185..1d6b2185 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/create_vmware_config_file_legacy.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/logging.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/logging.inc
index 62b1c691..62b1c691 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/logging.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/logging.inc
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/parse_vmx.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
index 7b9f46c3..7b9f46c3 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/parse_vmx.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/set_hardware.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware.inc
index 174bf314..174bf314 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/set_hardware.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware.inc
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/set_hardware_legacy.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware_legacy.inc
index f87d43cf..f87d43cf 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/set_hardware_legacy.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware_legacy.inc
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/set_vmware_include_variables.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_vmware_include_variables.inc
index 78f8c634..78f8c634 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/set_vmware_include_variables.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_vmware_include_variables.inc
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/write_config_files.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files.inc
index 05ee1dd5..05ee1dd5 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/write_config_files.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files.inc
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/write_config_files_legacy.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files_legacy.inc
index 52a341ba..52a341ba 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/write_config_files_legacy.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files_legacy.inc
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 806d9921..4bf53545 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
@@ -19,7 +19,7 @@
 ### This needs bash, not dash or ash! (indented HEREDOC)
 ################################################################################
 
-VMWAREINCLUDEDIR=/opt/openslx/vmchooser/vmware
+VMWAREINCLUDEDIR=/opt/openslx/vmchooser/vmware/includes
 vmostype=$(rv_clean_string "$vmostype")
 
 if [ "$LEGACY" ]; then