Restructuring run-virt.include for vmware ...

1 files changed, 58 insertions, 69 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 2de41d77..a4e03b7f 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
@@ -33,153 +33,142 @@ runvmwareconfheader ()
 {
 	echo "# This configuration file was generated by $0" > "$conffile"
 	
-  # does this makes sense? Depends on the VMworkstation in use
 	MAXMEM="9999999"
 	MAXCORES="4"
+	shfolders="TRUE"
+	sound="es1371"
 	
-	# check for the ostype
-	# 1) memory limits
+	# define hardware configuration depending on the guest OS used
+  # this needs to be fixed and is the base for the creation of new VMs
 	case "$vmostype" in
 		win31*|windows31*)
-			MAXMEM="32"
 			vmostype="win31"
+			shfolders="FALSE"
+			sound="sb16"
+			MAXMEM="32"
+			MAXCORES="1"
 		;;
 		winnt*|windowsnt*)
-			MAXMEM="1000"
 			vmostype="winnt"
+			shfolders="FALSE"
+			sound="sb16"
+			MAXMEM="1000"
+			MAXCORES="2"
 		;;
 		win95*|windows95*)
-			MAXMEM="96"
 			vmostype="win95"
+			shfolders="FALSE"
+			MAXMEM="96"
+			MAXCORES="1"
 		;;
 		win98*|windows98*)
-			MAXMEM="384"
 			vmostype="win98"
+			MAXMEM="256"
+			MAXCORES="1"
 		;;
 		winme*|windowsme*)
-			MAXMEM="384"
 			vmostype="winme"
+			MAXMEM="384"
+			MAXCORES="1"
 		;;
 		win2000|windows2000|win2000pro*)
-			MAXMEM="4000"
 			vmostype="win2000pro"
+			MAXMEM="4000"
+			MAXCORES="2"
 		;;
 		win2000srv*|windows2000srv*|win2000serv*|windows2000serv*)
-			MAXMEM="4000"
 			vmostype="win2000serv"
+			shfolders="FALSE"
+			MAXMEM="4000"
+			MAXCORES="4"
 		;;
 		win2000adv*|windows2000adv*|win2000dat*|windows2000dat*)
-			MAXMEM="8000"
 			vmostype="win2000advserv"
+			shfolders="FALSE"
+			MAXMEM="8000"
+			MAXCORES="8"
 		;;
 		winnet*64|win*2003*64|windowsnet*64)
-			MAXMEM="8000"
 			vmostype="winnetstandard-64"
+			MAXMEM="8000"
 		;;
 		winnet*|win*2003*|windowsnet*)
-			MAXMEM="4000"
 			vmostype="winnetstandard"
+			MAXMEM="4000"
 		;;
 		winxphome*|windowsxphome*)
-			MAXMEM="4000"
 			vmostype="winxphome"
+			MAXMEM="4000"
+			MAXCORES="1"
 		;;
 		winxp*64|windowsxp*64)
-			MAXMEM="8000"
 			vmostype="winxppro-64"
+			MAXMEM="8000"
+			MAXCORES="2"
 		;;
 		winxp*|windowsxp*)
-			MAXMEM="4000"
 			vmostype="winxppro"
+			MAXMEM="4000"
+			MAXCORES="1"
 		;;
 		winvista*64|windowsvista*64)
-			MAXMEM="16000"
 			vmostype="winvista-64"
+			MAXMEM="16000"
+			MAXCORES="2"
 		;;
 		winvista*|windowsvista*)
-			MAXMEM="8000"
 			vmostype="winvista"
+			MAXMEM="8000"
+			MAXCORES="2"
 		;;
 		win7*64|windows7*64)
-			MAXMEM="32000"
 			vmostype="windows7-64"
+			MAXMEM="32000"
+			MAXCORES="4"
 		;;
 		win7*|windows7*)
-			MAXMEM="8000"
 			vmostype="windows7"
+			MAXMEM="8000"
+			MAXCORES="4"
 		;;
 		win*64)
 			MAXMEM="16000"
+			MAXCORES="4"
 		;;
 		win*)
 			MAXMEM="8000"
 		;;
 		dos|msdos*|ms-dos*)
-			MAXMEM="128"
 			vmostype="dos"
-		;;
-		*64)
-			MAXMEM="123456"
-		;;
-		*)
-			MAXMEM="8000"
-		;;
-	esac
-	
-	# 2) other hardware + capabilities
-	shfolders="FALSE"
-	case "$vmostype" in
-		win31)
-			MAXCORES="1"
-			sound="sb16"
-		;;
-		winnt)
-			MAXCORES="2"
-			sound="sb16"
-		;;
-		win95|win98|winme)
-			MAXCORES="1"
-		;;
-		win2000pro) # Don't know if Win 2000 supports shared folders, disabled to be safe
-			MAXCORES="2"
-		;;
-		win2000serv)
-			MAXCORES="4"
-		;;
-		win2000advserv)
-			MAXCORES="8"
-		;;
-		winxphome)
-			MAXCORES="1"
-			shfolders="TRUE"
-		;;
-		winxp*|winvista*|windows7*)
-			MAXCORES="4"
-			shfolders="TRUE"
-		;;
-		winnet*)
-			shfolders="TRUE"
-		;;
-		linux*|ubuntu*|suse*|debian*)
-			shfolders="TRUE"
+			shfolders="FALSE"
+			MAXMEM="128"
 		;;
 		macos*64)
-			MAXCORES="2"
 			vmostype="freebsd-64"
+			MAXMEM="4000"
+			MAXCORES="2"
 		;;
 		macos*)
-			MAXCORES="1"
 			vmostype="freebsd"
+			MAXMEM="4000"
+			MAXCORES="1"
 		;;
 		beos*)
 			vmostype="other"
+			shfolders="FALSE"
 		;;
 		# Unknown guestOS setting in .xml - use conservative defaults
 		*64)
 			vmostype="other-64"
+			shfolders="FALSE"
+			MAXMEM="123456"
+			MAXCORES="4"
 		;;
 		*)
 			vmostype="other"
+			shfolders="FALSE"
+			MAXMEM="8000"
+			MAXCORES="1"
 		;;
 	esac
 	
@@ -259,7 +248,7 @@ floppy0.startConnected = "FALSE"
 floppy0.autodetect = "TRUE"
 floppy0.fileName = "auto detect"
 
-# we need floppy b: for our windows client configuration
+# we need floppy b: for the client configuration
 floppy1.present = "$floppy1"
 floppy1.startConnected = "TRUE"
 floppy1.fileType = "file"