[vmware] Support lsisas controllerwq

1 files changed, 33 insertions, 26 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 3d55fe78..8767d67f 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
@@ -284,7 +284,9 @@ runvmwareconfheader ()
 		sound.pciSlotNumber = "18"
 		ehci.pciSlotNumber = "19"
 		scsi0.pciSlotNumber = "20"
-		
+
+		$PCIE
+
 		# shared folders
 		$ENABLE_SHARE
 		sharedFolder0.present = "$shfolders"
@@ -428,7 +430,7 @@ conffile="${confdir}/run-vmware.conf"
 # diskfile
 diskfile="${vmpath}"
 # users vmware config folder
-[ -z "${HOME}" ] && HOME=$(/usr/bin/getent passwd "$(/usr/bin/whoami)" | awk -F ':' '{print $6}')
+[ -z "${HOME}" ] && HOME=$(getent passwd "$(/usr/bin/whoami)" | awk -F ':' '{print $6}')
 vmhome="${HOME}/.vmware"
 
 # get several version infos for vmware/player
@@ -558,35 +560,40 @@ fi
 ##
 hwver=$(echo "${imghead}" | grep -m1 -ia "ddb.virtualHWVersion" | awk -F '"' '{print $2}')
 
-if [ "x$override_hddtype" = "xide" ]; then
-	ide="TRUE"
-	scsi="FALSE"
-	hddrv="ide"
-elif [ "x$override_hddtype" = "xscsi" ]; then
-	ide="FALSE"
-	scsi="TRUE"
-	hddrv="lsilogic"
-else
-	unset override_hddtype
-fi
 
 if [ -z "$override_hddtype" ]; then
 	hddrv=$(echo "${imghead}" | grep -m1 -ia "ddb.adapterType" | awk -F '"' '{print $2}')
-	case "${hddrv}" in
-		ide)
-			ide="TRUE"
-			scsi="FALSE"
-		;;
-		lsilogic|buslogic)
-			ide="FALSE"
-			scsi="TRUE"
-		;;
-		*)
-			slxlog "virt-vmware-hdd" "vmware: Unknown HDD adapter type $hddrv"
-		;;
-	esac
+else
+	hddrv=$override_hddtype
 fi
 
+PCIE=
+case "${hddrv}" in
+	ide)
+		ide="TRUE"
+		scsi="FALSE"
+	;;
+	lsisas*)
+		ide="FALSE"
+		scsi="TRUE"
+		PCIE='pciBridge4.present = "TRUE"
+				pciBridge4.virtualDev = "pcieRootPort"
+				pciBridge4.functions = "8"'
+	;;
+	lsilogic|buslogic)
+		ide="FALSE"
+		scsi="TRUE"
+	;;
+	scsi)
+		ide="FALSE"
+		scsi="TRUE"
+		hddrv="lsilogic"
+	;;
+	*)
+		slxlog "virt-vmware-hdd" "vmware: Unknown HDD adapter type $hddrv"
+	;;
+esac
+
 # write configuration files
 ################################################################################