From 209bfa4debc92cb31426f0cc7b2a84c733917f7b Mon Sep 17 00:00:00 2001
From: Dirk
Date: Tue, 27 Nov 2012 21:57:10 +0100
Subject: Updating settings for VirtualBox ...

---
 src/os-plugins/plugins/virtualbox/XX_virtualbox.sh       |  8 ++++----
 src/os-plugins/plugins/virtualbox/files/machine.include  |  2 +-
 src/os-plugins/plugins/virtualbox/files/run-virt.include | 11 +++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'src/os-plugins/plugins/virtualbox')

diff --git a/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh b/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh
index b866071b..161825ea 100644
--- a/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh
+++ b/src/os-plugins/plugins/virtualbox/XX_virtualbox.sh
@@ -90,10 +90,10 @@ if [ -e ${CONFFILE} ]; then
     chown root:vboxusers /dev/vboxdrv
 
     # setting the base samba configuration
-#   [ -f /mnt/opt/openslx/plugins/virtualization/smb.conf -a -f /mnt/usr/sbin/smbd ] && \
-#    sed -e "s,NWIF,vboxnet0,;s,PIDDIR,/var/run/vbox," \
-#      /mnt/opt/openslx/plugins/virtualization/smb.conf \
-#      >/mnt/etc/vbox/smb.conf
+    [ -f /mnt/opt/openslx/plugins/virtualization/smb.conf -a -f /mnt/usr/sbin/smbd ] && \
+      sed -e "s,NWIF,vboxnet0,;s,PIDDIR,/var/run/vbox," \
+        /mnt/opt/openslx/plugins/virtualization/smb.conf \
+        >/mnt/etc/vbox/smb.conf
 
     # finished ...
     [ $DEBUGLEVEL -gt 0 ] && echo "done with 'virtualbox' os-plugin ..."
diff --git a/src/os-plugins/plugins/virtualbox/files/machine.include b/src/os-plugins/plugins/virtualbox/files/machine.include
index 7b81390d..e77ab1e3 100644
--- a/src/os-plugins/plugins/virtualbox/files/machine.include
+++ b/src/os-plugins/plugins/virtualbox/files/machine.include
@@ -28,7 +28,7 @@ cat << EOF > "${machconfig}"
         <Order position="4" device="None"/>
       </Boot>
       <!-- check for xml configured enable3d parameter --> 
-      <Display VRAMSize="24" monitorCount="1" accelerate3D="${enable3d}" accelerate2DVideo="true"/>
+      <Display VRAMSize="${vram}" monitorCount="1" accelerate3D="${enable3d}" accelerate2DVideo="${enable2d}"/>
       <!-- authType="External", "Guest", "Null" -->
       <RemoteDisplay enabled="false" port="${vrdpport}" authType="Null" authTimeout="5000"/>
       <BIOS>
diff --git a/src/os-plugins/plugins/virtualbox/files/run-virt.include b/src/os-plugins/plugins/virtualbox/files/run-virt.include
index 0c858bee..374b4b19 100644
--- a/src/os-plugins/plugins/virtualbox/files/run-virt.include
+++ b/src/os-plugins/plugins/virtualbox/files/run-virt.include
@@ -54,6 +54,10 @@ mkdir -p ${diskfolder} ${snapshotdir} 2>/dev/null
 guestaudio="AC97"
 # default guest network adaptor
 vb_network_card="Am79C973"
+# default setting for accelerated 2D grapics (OS dependent)
+enable2d="true"
+# set default graphics ram
+vram="128"
 
 # configure our own rwimg, empty image which we provide
 if [ "${imgmode}" = "rwimg" ]; then
@@ -91,21 +95,25 @@ case "${vmostype}" in
     guestaudio="SB16"
     vmostype="Windows31"
     mem="32"
+    vram="16"
     cpu_cores=1
   ;;
   win95*)
     vmostype="Windows95"
     mem="92"
+    vram="32"
     cpu_cores=1
   ;;
   win98*)
     vmostype="Windows98"
     mem="256"
+    vram="64"
     cpu_cores=1
   ;;
   winme*)
     vmostype="WindowsMe"
     mem="256"
+    vram="64"
     cpu_cores=1
   ;;
   winxp*|windowsxp*)
@@ -138,12 +146,15 @@ case "${vmostype}" in
     mem="256"
     vmostype="OS2eCS"
     cpu_cores=1
+    enable2d="false"
   ;;
   macos*|MacOS*)
     vmostype="MacOS"
+    enable2d="false"
   ;;
   *)
     vmostype="Other"
+    enable2d="false"
   ;;
 esac
 
-- 
cgit v1.2.3-55-g7522