[vm*] Add hdd adapter type override option, to quickly fix vms where the vmdk header containse wrong information

1 files changed, 29 insertions, 14 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 3f24e9d5..ef29f495 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
@@ -534,21 +534,36 @@ checkpoint.vmState = \"$stateFilePath\""
     POSTRUN="stateFilePath=\"\$(readlink -f \"${confdir}/\"*.vmss)\" && memoryFilePath=\"\$(readlink -f \"${confdir}/\"*.vmem)\" && [ -f \"\$stateFilePath\" ] && echo \"Saving state and memory file \\\"\$stateFilePath\\\" and \\\"\$memoryFilePath\\\".\" && mv -f \"\$stateFilePath\" \"$(dirname "$diskfile")/\" && mv -f \"\$memoryFilePath\" \"$(dirname "$diskfile")/\""
 fi
 ##
-hddrv=$(echo "${imghead}" | grep -m1 -ia "ddb.adapterType" | awk -F '"' '{print $2}')
 hwver=$(echo "${imghead}" | grep -m1 -ia "ddb.virtualHWVersion" | 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
+
+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
+fi
 
 # write configuration files
 ################################################################################