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/virtualbox.include          | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

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

diff --git a/src/os-plugins/plugins/virtualbox/files/virtualbox.include b/src/os-plugins/plugins/virtualbox/files/virtualbox.include
index 7dddc432..0c7ba3ee 100644
--- a/src/os-plugins/plugins/virtualbox/files/virtualbox.include
+++ b/src/os-plugins/plugins/virtualbox/files/virtualbox.include
@@ -1,7 +1,7 @@
 # Include file (general template) for run-virt.include of the virtualbox plugin
 cat << EOF > "${confdir}/VirtualBox.xml"
 <?xml version="1.0"?>
-<VirtualBox xmlns="http://www.innotek.de/VirtualBox-settings" version="1.9-linux"> <!-- 1.7-linux -->
+<VirtualBox xmlns="http://www.innotek.de/VirtualBox-settings" version="1.12-linux"> <!-- 1.12-linux -->
   <Global>
     <ExtraData>
       <ExtraDataItem name="GUI/Input/AutoCapture" value="true"/>
@@ -9,11 +9,10 @@ cat << EOF > "${confdir}/VirtualBox.xml"
       <ExtraDataItem name="GUI/LastVMSelected" value="${machineuuid}"/>
       <ExtraDataItem name="GUI/LicenseAgreed" value="1,2,3,4,5,6,7,8,9"/>
       <ExtraDataItem name="GUI/MaxGuestResolution" value="any"/> <!-- auto, width,height -->
-      <ExtraDataItem name="GUI/SUNOnlineData" value="triesLeft=0"/>
-      <ExtraDataItem name="GUI/SuppressMessages" value=",remindAboutAutoCapture,confirmInputCapture,remindAboutWrongColorDepth,confirmGoingFullscreen,remindAboutMouseIntegrationOn,remindAboutMouseIntegrationOff,showRuntimeError.warning.DevATA_DISKFULL,remindAboutPausedVMInput,confirmVMReset,showRuntimeError.warning.HostAudioNotResponding,showRuntimeError.warning.ExtPackNoEhci"/>
-      <ExtraDataItem name="GUI/TrayIcon/Enabled" value="false"/>
       <ExtraDataItem name="GUI/UpdateCheckCount" value="2"/>
       <ExtraDataItem name="GUI/UpdateDate" value="never"/>
+      <ExtraDataItem name="GUI/SuppressMessages" value=",remindAboutAutoCapture,confirmInputCapture,remindAboutWrongColorDepth,confirmGoingFullscreen,remindAboutMouseIntegrationOn,remindAboutMouseIntegrationOff,showRuntimeError.warning.DevATA_DISKFULL,remindAboutPausedVMInput,confirmVMReset,showRuntimeError.warning.HostAudioNotResponding,showRuntimeError.warning.ExtPackNoEhci"/>
+      <ExtraDataItem name="GUI/TrayIcon/Enabled" value="false"/>
     </ExtraData>
     <MachineRegistry>
       <MachineEntry uuid="{${machineuuid}}" src="Machines/${vm_shortname}/${vm_shortname}.xml"/>
@@ -25,22 +24,19 @@ cat << EOF > "${confdir}/VirtualBox.xml"
         </HardDisk>
       </HardDisks>
       <!--
-      <DVDImages>
-        <Image uuid="{dcd1e32a-729f-4faa-b319-67adca15e4a4}" location="/.../gpxe-1.0.0+-virtio-net.iso"/>
-        <Image uuid="{b71450c6-b8ff-43c1-a290-2a793b3023d8}" location="/.../gpxe-1.0.0+-e1000.iso"/>
-      </DVDImages>
+      <DVDImages/>
       -->
       <FloppyImages/>
     </MediaRegistry>
     <NetserviceRegistry>
       <DHCPServers>
-        <DHCPServer networkName="HostInterfaceNetworking-vboxnet0" IPAddress="192.168.56.100" networkMask="255.255.255.0" lowerIP="192.168.56.101" upperIP="192.168.56.254" enabled="1"/>
+        <DHCPServer networkName="HostInterfaceNetworking-vboxnet0" IPAddress="192.168.102.100" networkMask="255.255.255.0" lowerIP="192.168.102.101" upperIP="192.168.102.254" enabled="1"/>
         <!--
         <DHCPServer networkName="HostInterfaceNetworking-vboxnet1" IPAddress="0.0.0.0" networkMask="0.0.0.0" lowerIP="0.0.0.0" upperIP="0.0.0.0" enabled="0"/>
         -->
       </DHCPServers>
     </NetserviceRegistry>
-    <SystemProperties defaultMachineFolder="${machfolder}" defaultHardDiskFolder="${diskfolder}" defaultHardDiskFormat="VDI" remoteDisplayAuthLibrary="VRDPAuth" webServiceAuthLibrary="VRDPAuth" LogHistoryCount="3"/>
+    <SystemProperties defaultMachineFolder="${machfolder}" defaultHardDiskFolder="${diskfolder}" defaultHardDiskFormat="VDI" remoteDisplayAuthLibrary="VBoxAuth" webServiceAuthLibrary="VBoxAuth" LogHistoryCount="3"/>
     <USBDeviceFilters/>
   </Global>
 </VirtualBox>
-- 
cgit v1.2.3-55-g7522