From 3f8dde8d0cfb4784f83a26c58063feb36f566f5a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 17 Jan 2014 13:28:00 +0100
Subject: [vm*] Add hdd adapter type override option, to quickly fix vms where
 the vmdk header containse wrong information

---
 .../data/opt/openslx/scripts/vmchooser-run_virt    |  1 +
 .../opt/openslx/vmchooser/vmware/run-virt.include  | 43 +++++++++++++++-------
 2 files changed, 30 insertions(+), 14 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
index bef43dd1..8e4e57a8 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -316,6 +316,7 @@ vmostype=$(grep -io '<os param=.*"' "${xmlfile}" | awk -F '"' '{ print $2 }' | t
 # Definition of the networking the client system is connected to
 network_kind=$(grep -io '<network param=.*"' "${xmlfile}" | awk -F '"' '{ print $2 }' | tr "[A-Z]" "[a-z]")
 network_card=$(grep -io '<netcard param=.*"' "${xmlfile}" | awk -F '"' '{ print $2 }'| tr "[A-Z]" "[a-z]")
+override_hddtype=$(grep -io '<hddtype param=.*"' "${xmlfile}" | awk -F '"' '{ print $2 }'| tr "[A-Z]" "[a-z]")
 
 # Set redirects to 0, see vmgrid if you want to define some
 redirects=0
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
 ################################################################################
-- 
cgit v1.2.3-55-g7522