diff options
| author | Christian Rößler | 2015-07-16 16:30:20 +0200 |
|---|---|---|
| committer | Christian Rößler | 2015-07-16 16:30:20 +0200 |
| commit | f0f5f9acb6407ca33f2d7387a1f7ee6ee9db9b80 (patch) | |
| tree | 005db6bfc1b7305142c294b041720aa9bdfebe3b /remote | |
| parent | [vbox] Some more stuff: Now USB (but no working passthr.), VBox 5, USB2, USB ... (diff) | |
| parent | [vmware] Only force sound card if default isn't card 0 (diff) | |
| download | tm-scripts-f0f5f9acb6407ca33f2d7387a1f7ee6ee9db9b80.tar.gz tm-scripts-f0f5f9acb6407ca33f2d7387a1f7ee6ee9db9b80.tar.xz tm-scripts-f0f5f9acb6407ca33f2d7387a1f7ee6ee9db9b80.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include | 61 |
1 files changed, 34 insertions, 27 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..7788e6a6 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 @@ -469,7 +471,7 @@ esac sound="es1371" # set sound card explicitly if there is more than one card in the host system -if [ -n "$SOUND_CARD_INDEX" -a -n "$SOUND_CARD_COUNT" ] && [ "$SOUND_CARD_COUNT" -gt 1 ]; then +if [ -n "$SOUND_CARD_INDEX" ] && [ "$SOUND_CARD_INDEX" -ne 0 ]; then sound_fileName="sound.fileName = \"sysdefault:CARD=${SOUND_CARD_INDEX}\" sound.autodetect = \"FALSE\"" else @@ -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 ################################################################################ |