diff options
| author | Simon Rettberg | 2015-12-10 17:45:09 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2015-12-10 17:45:09 +0100 |
| commit | 9eaa002b3fb8de55d4b2a46a82b28a4993fd3863 (patch) | |
| tree | 2a9f4eb3a00c850611c5af4d06ba0bfb03b6a557 /remote/modules | |
| parent | [hardware-stats] Fix fdisk grep expression for id44 partiton (diff) | |
| download | tm-scripts-9eaa002b3fb8de55d4b2a46a82b28a4993fd3863.tar.gz tm-scripts-9eaa002b3fb8de55d4b2a46a82b28a4993fd3863.tar.xz tm-scripts-9eaa002b3fb8de55d4b2a46a82b28a4993fd3863.zip | |
[run-virt/vmware] Add windows 10
Diffstat (limited to 'remote/modules')
2 files changed, 25 insertions, 15 deletions
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/vmchooser_runvirt_functions.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/vmchooser_runvirt_functions.inc index 267d89e4..f20b799f 100644 --- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/vmchooser_runvirt_functions.inc +++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/vmchooser_runvirt_functions.inc @@ -39,8 +39,8 @@ cleanexit() { rv_clean_string() { if [ "$#" -ge 1 ]; then - echo "$@" | tr '[A-Z]' '[a-z]' | tr -d -c '[a-z0-9]' + echo "$@" | tr '[A-Z]' '[a-z]' | tr -d -c '[a-z0-9\-]' else - tr '[A-Z]' '[a-z]' | tr -d -c '[a-z0-9]' + tr '[A-Z]' '[a-z]' | tr -d -c '[a-z0-9\-]' fi } diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc index b39000d7..7843271a 100644 --- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc @@ -82,33 +82,43 @@ case "$vmostype" in MAXMEM="4000" MAXCORES="1" ;; - winvista*64|windowsvista*64) + winvista-64) vmostype="winvista-64" MAXMEM="16000" MAXCORES="2" ;; - winvista*|windowsvista*) - vmostype="winvista" - MAXMEM="8000" - MAXCORES="2" - ;; - win7*64|windows7*64) + windows7-64) vmostype="windows7-64" MAXMEM="32000" MAXCORES="4" ;; - win7*|windows7*) + windows8-64) + vmostype="windows8-64" + MAXMEM="32000" + MAXCORES="8" + ;; + windows9-64) + vmostype="windows9-64" + MAXMEM="64000" + MAXCORES="8" + ;; + winvista) + vmostype="winvista" + MAXMEM="8000" + MAXCORES="2" + ;; + windows7) vmostype="windows7" MAXMEM="8000" MAXCORES="4" ;; - win8*64|windows8*64) - vmostype="windows8-64" - MAXMEM="32000" + windows8) + vmostype="windows8" + MAXMEM="8000" MAXCORES="4" ;; - win8*|windows8*) - vmostype="windows8" + windows9) + vmostype="windows9" MAXMEM="8000" MAXCORES="4" ;; |