[vmware/run-virt] Try to rename includes to what they actually do

1 files changed, 12 insertions, 10 deletions

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 4d263272..08188b58 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
@@ -42,24 +42,26 @@ if [ "$LEGACY" ]; then
 	#	set_vmware_startup_file
 	source "${VMWAREINCLUDEDIR}/write_config_files_legacy.inc" && write_config_files_legacy
 else
-	# write configuration files
-	source "${VMWAREINCLUDEDIR}/write_config_files.inc"
+	# get information from downloaded vmx
+	source "${VMWAREINCLUDEDIR}/parse_vmx.inc"
+
+	# determine limitations wrt RAM and CPU count of VM
+	source "${VMWAREINCLUDEDIR}/determine_hardware_limitations.inc"
+
+	# create file and directory structure for vmware setup
+	source "${VMWAREINCLUDEDIR}/create_static_directory_structure.inc"
+
+	# create preferences file ${vmhome}/preferences
+	source "${VMWAREINCLUDEDIR}/create_vmhome_preferences_file.inc" && create_vmhome_preferences_file
 
 	# parse the given vmx file
-	source "${VMWAREINCLUDEDIR}/parse_vmx.inc"
+	source "${VMWAREINCLUDEDIR}/write_final_vmx.inc"
 fi
 
 # logging and stdout
 # needs writelog() from vmchooser-run_virt
 source "${VMWAREINCLUDEDIR}/logging.inc" && logging
 
-# See if there are any USB devices connected that we want to pass through immediately
-get_usb_devices 'usb.autoConnect.deviceXXXXX = "0x%VENDOR%:0x%PRODUCT%"' \
-	| sed -r 's/0x0+/0x/g' \
-	| awk '{sub(/XXXXX/,NR-1)}1' \
-	>> "$conffile"
-
-
 # For debugging
 cp "$conffile" "/tmp/vmware-last-config"