summaryrefslogtreecommitdiffstats
path: root/remote/modules
diff options
context:
space:
mode:
authorJonathan Bauer2014-01-23 16:20:12 +0100
committerJonathan Bauer2014-01-23 16:20:12 +0100
commit41e4d55ec4eeebc488c97ffa37711198a556e861 (patch)
tree4e87ae2b257da1c443907f3ec2cd254c6f572eae /remote/modules
parent[packagemanager.inc] add 'etc/init.d' to blacklist for package listing (diff)
parent[vmware] run-virt.include: +windows8, windows8-64. Values same as windows7(-64). (diff)
downloadtm-scripts-41e4d55ec4eeebc488c97ffa37711198a556e861.tar.gz
tm-scripts-41e4d55ec4eeebc488c97ffa37711198a556e861.tar.xz
tm-scripts-41e4d55ec4eeebc488c97ffa37711198a556e861.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
-rwxr-xr-xremote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exebin12800 -> 12800 bytes
-rw-r--r--remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include10
2 files changed, 10 insertions, 0 deletions
diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe b/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe
index 13092874..8b320003 100755
--- a/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/data/openslx.exe
Binary files differ
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
index ef29f495..3933287b 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
@@ -131,6 +131,16 @@ runvmwareconfheader ()
MAXMEM="8000"
MAXCORES="4"
;;
+ win8*64|windows8*64)
+ vmostype="windows8-64"
+ MAXMEM="32000"
+ MAXCORES="4"
+ ;;
+ win8*|windows8*)
+ vmostype="windows8"
+ MAXMEM="8000"
+ MAXCORES="4"
+ ;;
win*64)
MAXMEM="16000"
MAXCORES="4"