diff options
| -rw-r--r-- | src/installer/OpenSLX/OSSetup/Engine.pm | 21 | ||||
| -rw-r--r-- | src/os-plugins/plugins/vmware/files/run-virt.include | 53 |
2 files changed, 20 insertions, 54 deletions
diff --git a/src/installer/OpenSLX/OSSetup/Engine.pm b/src/installer/OpenSLX/OSSetup/Engine.pm index 2ecceeed..682a6c0f 100644 --- a/src/installer/OpenSLX/OSSetup/Engine.pm +++ b/src/installer/OpenSLX/OSSetup/Engine.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2006..2012 - OpenSLX GmbH +# Copyright (c) 2006..2014 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -75,19 +75,20 @@ use vars qw(%supportedDistros); 'suse-11.4_x86_64' => 'clone,update,shell', 'suse-12.1' => 'clone,install,update,shell', 'suse-12.1_x86_64' => 'clone,update,shell', - 'ubuntu-8.04' => 'clone,install,update,shell', + 'ubuntu-8.04' => 'clone,update,shell', 'ubuntu-8.04_amd64' => 'clone,update,shell', - 'ubuntu-8.10' => 'clone,install,update,shell', + 'ubuntu-8.10' => 'clone,update,shell', 'ubuntu-8.10_amd64' => 'clone,update,shell', - 'ubuntu-9.04' => 'clone,install,update,shell', + 'ubuntu-9.04' => 'clone,update,shell', 'ubuntu-9.04_amd64' => 'clone,update,shell', - 'ubuntu-9.10' => 'clone,install,update,shell', + 'ubuntu-9.10' => 'clone,update,shell', 'ubuntu-9.10_amd64' => 'clone,update,shell', - 'ubuntu-10.04' => 'clone,install,update,shell', - 'ubuntu-10.10' => 'clone,install,update,shell', - 'ubuntu-11.04' => 'clone,install,update,shell', - 'ubuntu-11.10' => 'clone,install,update,shell', - 'ubuntu-12.04' => 'clone,install,update,shell', + 'ubuntu-10.04' => 'clone,update,shell', + 'ubuntu-10.10' => 'clone,update,shell', + 'ubuntu-11.04' => 'clone,update,shell', + 'ubuntu-11.10' => 'clone,update,shell', + 'ubuntu-12.04' => 'clone,update,shell', + 'ubuntu-14.04' => 'clone,update,shell', ); my %localHttpServers; diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include index 603c8e9b..be6eb9b4 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..2013 - OpenSLX GmbH +# Copyright (c) 2009..2014 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -81,14 +81,14 @@ config.version = \"8\"" >>${conffile} ;; esac case "$vmversion" in - 2.*|3.*|4.*|5.*|6.*|7.*|8.*|9.*) + 2.*|3.*|4.*|5.*|6.*|7.*|8.*|9.*|10.*) [ ${shfolders} == FALSE ] || echo " -# version specific stuff - ver. 2.*|3.*|6.*|7.*|8.*|9.* +# version specific stuff - ver. 2.*|3.*|6.*|7.*|8.*|9.*|10.* sharedFolder.option = \"alwaysEnabled\"" >>${conffile} ;; esac case "$vmversion" in - 2.5|3.*|4.*|5.*|6.5|7.*|8.*|9.*) + 2.5|3.*|4.*|5.*|6.5|7.*|8.*|9.*|10.*) if [ "${cpu_cores}" -ge "2" 2>/dev/null ]; then numvcpus="2" fi @@ -97,20 +97,20 @@ case "$vmversion" in fi cap3d="TRUE" # helper var for loging output echo " -# version specific stuff - ver. 2.5|3.*|6.5|7.* +# version specific stuff - ver. 2.5|3.*|6.5|7.*|8.*|9.*|10.* ehci.present = \"TRUE\" mks.enable3d = \"${enable3d}\"" >>${conffile} ;; esac case "$vmversion" in - 3.*|4.*|7.*|8.*|9.*) + 3.*|4.*|7.*|8.*|9.*|10.*) numvcpus="${cpu_cores}" if [ "${cpu_cores}" -ge "4" 2>/dev/null ]; then numvcpus="4" fi # svga_autodetect="FALSE" # if defined manual, see below echo " -# version specific stuff - ver. 3.*|7.* +# version specific stuff - ver. 3.*|7.*|8.*|9.*|10.* cpuid.coresPerSocket = \"${cpu_cores}\" maxvcpus = \"4\" monitor.virtual_mmu = \"automatic\" @@ -281,7 +281,7 @@ pref.eula.0.buildNumber = \"${vmbuild}\" pref.eula.1.appName = \"VMware Workstation\" pref.eula.1.buildNumber = \"${vmbuild}\"" >>${vmhome}/preferences ;; - 5.*|9.*) + 5.*|9.*|10.*) # code echo " pref.eula.count = \"2\" @@ -382,42 +382,7 @@ case "$parallel" in ;; esac -# adjust memory available for vmware guests -#if [ -n "${forcemem}" ]; then -# mem="${forcemem}" -#else -# case "$vmversion" in -# 2.*|6.*) -# permem=30 -# ;; -# 3.*|7.*) -# permem=25 -# ;; -# esac -# if [ "${totalmem}" -ge "2500" ]; then -# permem=40 -# fi -# # check if /tmp is on harddisk -# if grep -qe "/dev/.* /tmp " /proc/mounts ; then -# permem=60 -# id44="1" -# # Hack, if more than 2,5G RAM use 40% of Ram and write vmem into Ram as well -# # (40% vmware | 40% confdir(vmem...) | 20% host -# # VMplayer 2+ issue -# if [ "${totalmem}" -ge "2500" ]; then -# permem=40 -# confdir=/dev/shm/vmware/$USER -# conffile=${confdir}/run-vmware.conf -# mkdir -p /dev/shm/vmware/$USER -# fi -# fi -# mem=$(expr ${totalmem} / 100 \* ${permem} / 4 \* 4) -# if [ "${id44}" = "1" ]; then -# hostmem=$(expr ${totalmem} - ${mem}) -# else -# hostmem=$(expr ${totalmem} - ${mem} - ${mem}) -# fi -#fi + # check if ide/scsi and hwver of image # read only the first 30 lines to be shure |