diff options
| author | Simon Rettberg | 2014-01-17 18:01:53 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2014-01-17 18:01:53 +0100 |
| commit | 2dab5b88f40224742a07ceb92a955f5359d99e85 (patch) | |
| tree | fdaa44e5888cd72833e4ea9bf97780834df21b51 /remote/modules/vmware/data/opt | |
| parent | [pam] nss-ldap -> nss-ldapd (diff) | |
| parent | [rootfs-stage32] openSuse: Added cdrom module (REQUIRED_KERNEL_MODULES+=) (diff) | |
| download | tm-scripts-2dab5b88f40224742a07ceb92a955f5359d99e85.tar.gz tm-scripts-2dab5b88f40224742a07ceb92a955f5359d99e85.tar.xz tm-scripts-2dab5b88f40224742a07ceb92a955f5359d99e85.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmware/data/opt')
| -rw-r--r-- | remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include | 43 |
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 ################################################################################ |