From 74be7469519e6201dd345359e5a396b2a8fafd6b Mon Sep 17 00:00:00 2001
From: Dirk
Date: Tue, 27 Nov 2012 15:49:43 +0100
Subject: Working on VirtualBox for OpenSLX clients ... (including changes for
 vmchooser)

---
 .../plugins/virtualbox/files/machine.include       | 78 +++++++---------------
 1 file changed, 25 insertions(+), 53 deletions(-)

(limited to 'src/os-plugins/plugins/virtualbox/files/machine.include')

diff --git a/src/os-plugins/plugins/virtualbox/files/machine.include b/src/os-plugins/plugins/virtualbox/files/machine.include
index 96acd7a2..7b81390d 100644
--- a/src/os-plugins/plugins/virtualbox/files/machine.include
+++ b/src/os-plugins/plugins/virtualbox/files/machine.include
@@ -1,17 +1,17 @@
-# Include file (machine template) for run-virt.include of the virtualbox plugin
+# Include file (machine template) for run-virt.include of the OpenSLX virtualbox plugin
 cat << EOF > "${machconfig}"
 <?xml version="1.0"?>
-<VirtualBox xmlns="http://www.innotek.de/VirtualBox-settings" version="1.9-linux">
+<VirtualBox xmlns="http://www.innotek.de/VirtualBox-settings" version="1.12-linux">
   <Machine uuid="{${machineuuid}}" name="${vm_name}" OSType="${vmostype}">
     <ExtraData>
       <ExtraDataItem name="GUI/AutoresizeGuest" value="on"/>
       <ExtraDataItem name="GUI/Fullscreen" value="on"/>
       <ExtraDataItem name="GUI/LastCloseAction" value="powerOff"/>
-      <ExtraDataItem name="GUI/MiniToolBarAlignment" value="top"/>
       <ExtraDataItem name="GUI/MiniToolBarAutoHide" value="on"/>
+      <ExtraDataItem name="GUI/MiniToolBarAlignment" value="top"/>
+      <ExtraDataItem name="GUI/ShowMiniToolBar" value="yes"/>
       <ExtraDataItem name="GUI/SaveMountedAtRuntime" value="yes"/>
       <ExtraDataItem name="GUI/Seamless" value="off"/>
-      <ExtraDataItem name="GUI/ShowMiniToolBar" value="yes"/>
     </ExtraData>
     <Hardware version="2">
       <CPU count="${cpu_cores}">
@@ -27,7 +27,8 @@ cat << EOF > "${machconfig}"
         <Order position="3" device="None"/>
         <Order position="4" device="None"/>
       </Boot>
-      <Display VRAMSize="24" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/>
+      <!-- check for xml configured enable3d parameter --> 
+      <Display VRAMSize="24" monitorCount="1" accelerate3D="${enable3d}" accelerate2DVideo="true"/>
       <!-- authType="External", "Guest", "Null" -->
       <RemoteDisplay enabled="false" port="${vrdpport}" authType="Null" authTimeout="5000"/>
       <BIOS>
@@ -43,13 +44,13 @@ cat << EOF > "${machconfig}"
         <Adapter slot="0" enabled="true" MACAddress="${macaddr}" cable="true" speed="0" type="${vb_network_card}">
           <${network_kind}/>
         </Adapter>
-        <Adapter slot="1" enabled="false" MACAddress="0800279312FB" cable="true" speed="0" type="Am79C973"/>
-        <Adapter slot="2" enabled="false" MACAddress="080027A3A3CA" cable="true" speed="0" type="Am79C973"/>
-        <Adapter slot="3" enabled="false" MACAddress="0800277356F6" cable="true" speed="0" type="Am79C973"/>
-        <Adapter slot="4" enabled="false" MACAddress="080027CEA83A" cable="true" speed="0" type="Am79C973"/>
-        <Adapter slot="5" enabled="false" MACAddress="0800271B8D7A" cable="true" speed="0" type="Am79C973"/>
-        <Adapter slot="6" enabled="false" MACAddress="08002771BBD7" cable="true" speed="0" type="Am79C973"/>
-        <Adapter slot="7" enabled="false" MACAddress="080027EB6A12" cable="true" speed="0" type="Am79C973"/>
+        <Adapter slot="1" enabled="false" MACAddress="0800279312CC" cable="true" speed="0" type="Am79C973"/>
+        <Adapter slot="2" enabled="false" MACAddress="080027A3A3CC" cable="true" speed="0" type="Am79C973"/>
+        <Adapter slot="3" enabled="false" MACAddress="0800277356CC" cable="true" speed="0" type="Am79C973"/>
+        <Adapter slot="4" enabled="false" MACAddress="080027CEA8CC" cable="true" speed="0" type="Am79C973"/>
+        <Adapter slot="5" enabled="false" MACAddress="0800271B8DCC" cable="true" speed="0" type="Am79C973"/>
+        <Adapter slot="6" enabled="false" MACAddress="08002771BBCC" cable="true" speed="0" type="Am79C973"/>
+        <Adapter slot="7" enabled="false" MACAddress="080027EB6ACC" cable="true" speed="0" type="Am79C973"/>
       </Network>
       <UART>
         <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/>
@@ -59,7 +60,9 @@ cat << EOF > "${machconfig}"
         <Port slot="0" enabled="false" IOBase="0x378" IRQ="4"/>
         <Port slot="1" enabled="false" IOBase="0x378" IRQ="4"/>
       </LPT>
-      <AudioAdapter controller="AC97" driver="Alsa" enabled="${audio}"/> <!-- OSS, Alsa, Pulse (HANGS!) -->
+      <!-- should be configured depending on the chosen operating system -->
+      <AudioAdapter controller="${guestaudio}" driver="Alsa" enabled="${audio}"/> <!-- OSS, Alsa, Pulse -->
+      <!-- should be configured depending on the chosen operating system -->
       <SharedFolders>
         <SharedFolder name="${sharename}" hostPath="${sharepath}" writable="true"/>
       </SharedFolders>
@@ -67,48 +70,17 @@ cat << EOF > "${machconfig}"
       <Guest memoryBalloonSize="0" statisticsUpdateInterval="0"/>
       <!--
       <GuestProperties>
-        <GuestProperty name="/VirtualBox/HostGuest/SysprepExec" value="" timestamp="1268140071072779000" flags="TRANSIENT, RDONLYGUEST"/>
-        <GuestProperty name="/VirtualBox/HostGuest/SysprepArgs" value="" timestamp="1268140071072939000" flags="TRANSIENT, RDONLYGUEST"/>
-        <GuestProperty name="/VirtualBox/GuestInfo/OS/Product" value="Linux" timestamp="1268140265864540000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/OS/Release" value="2.6.27.21" timestamp="1268140265894019000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/OS/Version" value="#3 SMP Fri Feb 26 16:38:21 CET 2010" timestamp="1268140265898448000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/OS/ServicePack" value="" timestamp="1268140265899571000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestAdd/Revision" value="57640" timestamp="1268140265900144000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestAdd/Version" value="3.1.4" timestamp="1268140265899937000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/OS/LoggedInUsers" value="1" timestamp="1268164075148440000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/Count" value="4" timestamp="1268164075148790000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/0/V4/IP" value="132.230.4.224" timestamp="1268164075149053000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/0/V4/Broadcast" value="132.230.4.255" timestamp="1268164075149297000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/0/V4/Netmask" value="255.255.255.0" timestamp="1268164075149596000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/0/Status" value="Up" timestamp="1268164075149829000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/1/V4/IP" value="192.168.112.1" timestamp="1268164075150037000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/1/V4/Broadcast" value="192.168.112.255" timestamp="1268164075150238000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/1/V4/Netmask" value="255.255.255.0" timestamp="1268164075150439000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/1/Status" value="Up" timestamp="1268164075150635000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/2/V4/IP" value="192.168.54.1" timestamp="1268164075150835000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/2/V4/Broadcast" value="192.168.54.255" timestamp="1268164075151072000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/2/V4/Netmask" value="255.255.255.0" timestamp="1268164075151282000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/2/Status" value="Up" timestamp="1268164075151479000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/OS/NoLoggedInUsers" value="false" timestamp="1268140276063587000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestAdd/Vbgl/Video/SavedMode" value="1024x768x32" timestamp="1268140287190297000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestAdd/HostVerLastChecked" value="3.1.4" timestamp="1268140310962236000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/3/V4/IP" value="192.168.122.1" timestamp="1268164075152293000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/3/V4/Broadcast" value="192.168.122.255" timestamp="1268164075152615000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/3/V4/Netmask" value="255.255.255.0" timestamp="1268164075152828000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/3/Status" value="Up" timestamp="1268164075153029000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/4/V4/IP" value="169.254.4.104" timestamp="1265728007966805000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/4/V4/Broadcast" value="169.254.255.255" timestamp="1265728007967184000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/4/V4/Netmask" value="255.255.0.0" timestamp="1265728007967487000" flags=""/>
-        <GuestProperty name="/VirtualBox/GuestInfo/Net/4/Status" value="Up" timestamp="1265728007967829000" flags=""/>
-        <GuestProperty name="/VirtualBox/HostInfo/GUI/LanguageID" value="de_DE" timestamp="1268140070610343000" flags=""/>
-        <GuestProperty name="/VirtualBox/HostInfo/VBoxVer" value="3.1.4" timestamp="1268154582522485000" flags="TRANSIENT, RDONLYGUEST"/>
-        <GuestProperty name="/VirtualBox/HostInfo/VBoxRev" value="57640" timestamp="1268154582522507000" flags="TRANSIENT, RDONLYGUEST"/>
-        <GuestProperty name="/VirtualBox/GuestInfo/OS/LoggedInUsersList" value="vmuser" timestamp="1268164075147867000" flags=""/>
+        <GuestProperty name="/VirtualBox/HostGuest/SysprepExec" value="" timestamp="1268140071072799000" flags="TRANSIENT, RDONLYGUEST"/>
+        <GuestProperty name="/VirtualBox/HostGuest/SysprepArgs" value="" timestamp="1268140071072949000" flags="TRANSIENT, RDONLYGUEST"/>
+        <GuestProperty name="/VirtualBox/GuestInfo/OS/Product" value="Linux" timestamp="1268140267864540000" flags=""/>
+        <GuestProperty name="/VirtualBox/GuestInfo/OS/Release" value="4.1.2" timestamp="1268140267894449000" flags=""/>
+        <GuestProperty name="/VirtualBox/GuestInfo/OS/LoggedInUsersList" value="vbox" timestamp="1268164075149967000" flags=""/>
       </GuestProperties>
       -->
     </Hardware>
+    <!-- should be configured depending on the chosen operating system -->
     <StorageControllers>
-      <StorageController name="IDE-Controller" type="PIIX4" PortCount="2">
+      <StorageController name="IDE Controller" type="PIIX4" PortCount="2">
         <AttachedDevice type="HardDisk" port="0" device="0">
           <Image uuid="{${imageuuid}}"/>
         </AttachedDevice> <!-- PLEASE DO NOT REMOVE THIS COMMENT (HD)!!! -->
@@ -117,10 +89,10 @@ cat << EOF > "${machconfig}"
         </AttachedDevice> <!-- PLEASE DO NOT REMOVE THIS COMMENT (CD)!!! -->
       </StorageController>
       <!--
-      <StorageController name="Disketten-Controller" type="I82078" PortCount="1">
+      <StorageController name="Floppy Controller" type="I82078" PortCount="1">
         <AttachedDevice type="Floppy" port="0" device="0"/>
       </StorageController>
-      <StorageController name="SCSI-Controller" type="LsiLogic" PortCount="16">
+      <StorageController name="SCSI Controller" type="LsiLogic" PortCount="16">
         <AttachedDevice type="HardDisk" port="0" device="0">
           <Image uuid="{812c82bf-bd1a-4f59-a5b6-b54ae2f6c669}"/>
         </AttachedDevice>
-- 
cgit v1.2.3-55-g7522