diff options
Diffstat (limited to 'src/os-plugins/plugins')
4 files changed, 44 insertions, 8 deletions
diff --git a/src/os-plugins/plugins/virtualbox/files/machine.include b/src/os-plugins/plugins/virtualbox/files/machine.include index e77ab1e3..6367d3d9 100644 --- a/src/os-plugins/plugins/virtualbox/files/machine.include +++ b/src/os-plugins/plugins/virtualbox/files/machine.include @@ -1,4 +1,16 @@ -# Include file (machine template) for run-virt.include of the OpenSLX virtualbox plugin +# ----------------------------------------------------------------------------- +# Copyright (c) 2010..2012 - OpenSLX GmbH +# +# This program/file is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your feedback to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org +# ----------------------------------------------------------------------------- +# Include file (machine template) for run-virt.include of the OpenSLX virtual- +# box plugin cat << EOF > "${machconfig}" <?xml version="1.0"?> <VirtualBox xmlns="http://www.innotek.de/VirtualBox-settings" version="1.12-linux"> @@ -88,10 +100,14 @@ cat << EOF > "${machconfig}" <HostDrive src="${cdrom_0}"/> </AttachedDevice> <!-- PLEASE DO NOT REMOVE THIS COMMENT (CD)!!! --> </StorageController> - <!-- <StorageController name="Floppy Controller" type="I82078" PortCount="1"> - <AttachedDevice type="Floppy" port="0" device="0"/> + <AttachedDevice type="Floppy" port="0" device="0"> + </AttachedDevice> + <AttachedDevice type="Floppy" port="0" device="1"> + <Image uuid="{288d5452-2dd3-44f2-bfc8-78e205a4fa87}"/> + </AttachedDevice> </StorageController> + <!-- <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16"> <AttachedDevice type="HardDisk" port="0" device="0"> <Image uuid="{812c82bf-bd1a-4f59-a5b6-b54ae2f6c669}"/> diff --git a/src/os-plugins/plugins/virtualbox/files/run-virt.include b/src/os-plugins/plugins/virtualbox/files/run-virt.include index 4f07d8d6..cd5329a1 100644 --- a/src/os-plugins/plugins/virtualbox/files/run-virt.include +++ b/src/os-plugins/plugins/virtualbox/files/run-virt.include @@ -50,8 +50,8 @@ snapshotdir=${machfolder}/${vm_shortname}/Snapshots mkdir -p ${diskfolder} ${snapshotdir} 2>/dev/null # check if diskless var empty? [ -z "${diskless}" ] && diskless=0 -# default guest audio controller -guestaudio="AC97" +# default guest audio controller (SB16, AC97, HDA) +guestaudio="HDA" # default guest network adaptor vb_network_card="Am79C973" # default setting for accelerated 2D grapics (OS dependent) @@ -97,27 +97,33 @@ case "${vmostype}" in mem="32" vram="16" cpu_cores=1 + enablevt="false" ;; win95*) vmostype="Windows95" + guestaudio="SB16" mem="92" vram="32" cpu_cores=1 + enablevt="false" ;; win98*) vmostype="Windows98" + guestaudio="SB16" mem="256" vram="64" cpu_cores=1 ;; winme*) vmostype="WindowsMe" + guestaudio="AC97" mem="256" vram="64" cpu_cores=1 ;; winxp*|windowsxp*) vmostype="WindowsXP" + guestaudio="AC97" ;; winvista*|windowsvista*) vmostype="WindowsVista" @@ -345,8 +351,8 @@ writelog "\tBooting from:\t\t${boot}\c" #writelog "\tGuest VRDP port:\t${vrdpport}" writelog "\tCD-ROM1:\t\t${cdrom0}" #writelog "\tCD-ROM2:\t\t${cdrom1}" -#writelog "\tFloppy_A:\t\t${floppy0}" -#writelog "\tFloppy_B:\t\t${floppy1}" +writelog "\tFloppy_A:\t\t${floppy0}" +writelog "\tFloppy_B:\t\t${floppy1}" # defined in run-virt.sh and run-vmgrid.sh writelog "\tShared Folders '${sharename}':\t${sharepath}" diff --git a/src/os-plugins/plugins/virtualbox/files/virtualbox.include b/src/os-plugins/plugins/virtualbox/files/virtualbox.include index 0c7ba3ee..70ca394c 100644 --- a/src/os-plugins/plugins/virtualbox/files/virtualbox.include +++ b/src/os-plugins/plugins/virtualbox/files/virtualbox.include @@ -1,3 +1,14 @@ +# ----------------------------------------------------------------------------- +# Copyright (c) 2010..2012 - OpenSLX GmbH +# +# This program/file is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your feedback to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org +# ----------------------------------------------------------------------------- # Include file (general template) for run-virt.include of the virtualbox plugin cat << EOF > "${confdir}/VirtualBox.xml" <?xml version="1.0"?> @@ -26,7 +37,9 @@ cat << EOF > "${confdir}/VirtualBox.xml" <!-- <DVDImages/> --> - <FloppyImages/> + <FloppyImages> + <Image uuid="{288d5452-2dd3-44f2-bfc8-78e205a4fa87}" location="${floppy1name}"/> + </FloppyImages> </MediaRegistry> <NetserviceRegistry> <DHCPServers> diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include index 3a6227c1..698bd60e 100644 --- a/src/os-plugins/plugins/vmware/files/run-virt.include +++ b/src/os-plugins/plugins/vmware/files/run-virt.include @@ -192,6 +192,7 @@ usb.pciSlotNumber = "16" ethernet0.pciSlotNumber = "17" sound.pciSlotNumber = "18" ehci.pciSlotNumber = "19" +scsi0.pciSlotNumber = "20" # shared folders sharedFolder0.present = \"${shfolders}\" |