summaryrefslogtreecommitdiffstats
path: root/src/os-plugins/plugins/vmware
diff options
context:
space:
mode:
authorMichael Janczyk2012-12-17 17:56:33 +0100
committerMichael Janczyk2012-12-17 17:56:33 +0100
commit9d38d5a411160637eedd997e14ccb520b41421c0 (patch)
treeab38b46f60a9738740ec65830eb74188b959008e /src/os-plugins/plugins/vmware
parentFollow links in modprobe.d when copying to stage3. (diff)
parentUse zram if available (assign a quarter for compressed ram swap) (diff)
downloadcore-9d38d5a411160637eedd997e14ccb520b41421c0.tar.gz
core-9d38d5a411160637eedd997e14ccb520b41421c0.tar.xz
core-9d38d5a411160637eedd997e14ccb520b41421c0.zip
Merge branch 'master' of git.openslx.org:openslx/core
Diffstat (limited to 'src/os-plugins/plugins/vmware')
-rw-r--r--src/os-plugins/plugins/vmware/files/run-virt.include3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include
index 14b57316..698bd60e 100644
--- a/src/os-plugins/plugins/vmware/files/run-virt.include
+++ b/src/os-plugins/plugins/vmware/files/run-virt.include
@@ -82,7 +82,7 @@ config.version = \"8\"" >>${conffile}
esac
case "$vmversion" in
2.*|3.*|4.*|6.*|7.*|8.*|9.*)
- echo "
+ [ ${shfolders} == FALSE ] || echo "
# version specific stuff - ver. 2.*|3.*|6.*|7.*|8.*|9.*
sharedFolder.option = \"alwaysEnabled\"" >>${conffile}
;;
@@ -192,6 +192,7 @@ usb.pciSlotNumber = "16"
ethernet0.pciSlotNumber = "17"
sound.pciSlotNumber = "18"
ehci.pciSlotNumber = "19"
+scsi0.pciSlotNumber = "20"
# shared folders
sharedFolder0.present = \"${shfolders}\"