summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk2013-02-07 10:55:34 +0100
committerDirk2013-02-07 10:55:34 +0100
commit73a6e59aac2b657174ab4458b8aed4469614c4bf (patch)
treebf77b886832fdf41677abc71a75d15fd6c22ceea
parentVirtBox cannot run VMDKs in the way used here ... (diff)
downloadcore-73a6e59aac2b657174ab4458b8aed4469614c4bf.tar.gz
core-73a6e59aac2b657174ab4458b8aed4469614c4bf.tar.xz
core-73a6e59aac2b657174ab4458b8aed4469614c4bf.zip
Default settings for virtual box ...
-rw-r--r--src/os-plugins/plugins/virtualbox/files/run-virt.include11
-rw-r--r--src/os-plugins/plugins/vmware/files/run-virt.include6
2 files changed, 10 insertions, 7 deletions
diff --git a/src/os-plugins/plugins/virtualbox/files/run-virt.include b/src/os-plugins/plugins/virtualbox/files/run-virt.include
index 3e35af89..f5eb3c16 100644
--- a/src/os-plugins/plugins/virtualbox/files/run-virt.include
+++ b/src/os-plugins/plugins/virtualbox/files/run-virt.include
@@ -52,8 +52,8 @@ mkdir -p ${diskfolder} ${snapshotdir} 2>/dev/null
[ -z "${diskless}" ] && diskless=0
# default guest audio controller (SB16, AC97, HDA)
guestaudio="HDA"
-# default guest network adaptor
-vb_network_card="Am79C973"
+# default guest network adaptor (Am79C970A, Am79C973, 82540EM)
+vb_network_card="82540EM"
# default setting for accelerated 2D grapics (OS dependent)
enable2d="true"
# set default graphics ram
@@ -93,6 +93,7 @@ enablevt="false"
case "${vmostype}" in
win31*)
guestaudio="SB16"
+ vb_network_card="Am79C973"
vmostype="Windows31"
mem="32"
vram="16"
@@ -102,6 +103,7 @@ case "${vmostype}" in
win95*)
vmostype="Windows95"
guestaudio="SB16"
+ vb_network_card="Am79C973"
mem="92"
vram="32"
cpu_cores=1
@@ -110,6 +112,7 @@ case "${vmostype}" in
win98*)
vmostype="Windows98"
guestaudio="SB16"
+ vb_network_card="Am79C973"
mem="256"
vram="64"
cpu_cores=1
@@ -117,6 +120,7 @@ case "${vmostype}" in
winme*)
vmostype="WindowsMe"
guestaudio="AC97"
+ vb_network_card="Am79C973"
mem="256"
vram="64"
cpu_cores=1
@@ -131,6 +135,9 @@ case "${vmostype}" in
windows7*)
vmostype="Windows7"
;;
+ windows8*)
+ vmostype="Windows8"
+ ;;
linux*|*ubuntu*|*suse*|debian*|*sci*)
if echo "${vmostype}" | grep -q "64"; then
vmostype="Linux26_64"
diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include
index 698bd60e..ac18b521 100644
--- a/src/os-plugins/plugins/vmware/files/run-virt.include
+++ b/src/os-plugins/plugins/vmware/files/run-virt.include
@@ -1,7 +1,7 @@
# run-virt.include
# -----------------------------------------------------------------------------
# Copyright (c) 2009..2012 - RZ Uni Freiburg
-# Copyright (c) 2009..2012 - OpenSLX GmbH
+# Copyright (c) 2009..2013 - OpenSLX GmbH
#
# This program is free software distributed under the GPL version 2.
# See http://openslx.org/COPYING
@@ -110,10 +110,6 @@ case "$vmversion" in
# version specific stuff - ver. 3.*|7.*
cpuid.coresPerSocket = \"${cpu_cores}\"
maxvcpus = \"4\"
-# svga.numDisplays = "2"
-# svga.maxWidth = "2560"
-# svga.maxHeight = "2048"
-# svga.vramSize = "134217728"
monitor.virtual_mmu = \"automatic\"
monitor.virtual_exec = \"automatic\"
floppy1.clientDevice = \"FALSE\"