added cdrom and floppy support to virtualization

optimized (hopefully) preferences and vmx for vmware

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2682 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 13 insertions, 4 deletions

diff --git a/os-plugins/plugins/qemukvm/files/run-virt.include b/os-plugins/plugins/qemukvm/files/run-virt.include
index 13e5deb9..263801cc 100644
--- a/os-plugins/plugins/qemukvm/files/run-virt.include
+++ b/os-plugins/plugins/qemukvm/files/run-virt.include
@@ -14,18 +14,27 @@
 # client via the run-virt.sh. The stuff is copied to /etc/opt/openslx/run-
 # qemukvm.include during stage3.
 
+# include general configuration from vmchooser
+. /etc/opt/openslx/run-virt.include
 
 permem=66
 mem=$(expr ${totalmem} * ${permem})
 VIRTCMDOPTS="${VIRTCMDOPTS} -m ${mem}"
 
 # virtual fd/cd/dvd and drive devices, floppy b: for configuration
-#floppya is always false, if we have a floppy device or not isn't
-#important.
 #VIRTCMDOPTS="${VIRTCMDOPTS} -fda /dev/fd0"
 VIRTCMDOPTS="${VIRTCMDOPTS} -fdb /var/lib/virt/vmchooser/loopimg/fd.img"
-cdr_1="FALSE"
-cdr_2="FALSE"
+#floppy0="FALSE"
+# if $floppy_0 from run-virt.include set then floppy0="TRUE"
+#[ -n "$floppy_0" ] && floppy0="TRUE"
+#floppy1="TRUE"
+#floppy1name="/var/lib/virt/vmchooser/loopimg/fd.img"
+cdrom0="FALSE"
+# if $cdrom_0 from run-virt.include set then cdrom0="TRUE"
+[ -n "$cdrom_0" ] && cdrom0="TRUE"
+cdrom1="FALSE"
+# if $cdrom_1 from run-virt.include set then cdrom1="TRUE"
+[ -n "$cdrom_1" ] && cdrom1="TRUE"
 # ide is expected default, test for the virtual disk image type should
 # be done while creating the runscripts ...
 ide="TRUE"