From 9a5d8828d6710ffc408fbd9c62a4ad1d5a1a43d6 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 7 May 2018 12:59:46 +0200
Subject: [vmware*] fix CPU_CORES for vmware14 too

+ small formatting
---
 .../plugins/vmware/includes/determine_hardware_limitations.inc         | 3 ++-
 .../plugins/vmware/includes/determine_hardware_limitations.inc         | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/determine_hardware_limitations.inc b/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/determine_hardware_limitations.inc
index c288ed09..b7c59819 100644
--- a/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/determine_hardware_limitations.inc
+++ b/core/modules/vmware/data/opt/openslx/vmchooser/plugins/vmware/includes/determine_hardware_limitations.inc
@@ -174,7 +174,8 @@ set_vm_hardware_limits() {
 			MAXCORES="1"
 		;;
 	esac
-	
+
+	declare -g CPU_CORES="${HW_THREADS:-1}"
 	declare -rg HOST_CORE_COUNT="$CPU_CORES"
 	[ "$CPU_CORES" -gt "$MAXCORES" ] && CPU_CORES="$MAXCORES"
 	
diff --git a/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/includes/determine_hardware_limitations.inc b/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/includes/determine_hardware_limitations.inc
index 957a15f8..b7c59819 100644
--- a/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/includes/determine_hardware_limitations.inc
+++ b/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/includes/determine_hardware_limitations.inc
@@ -174,6 +174,7 @@ set_vm_hardware_limits() {
 			MAXCORES="1"
 		;;
 	esac
+
 	declare -g CPU_CORES="${HW_THREADS:-1}"
 	declare -rg HOST_CORE_COUNT="$CPU_CORES"
 	[ "$CPU_CORES" -gt "$MAXCORES" ] && CPU_CORES="$MAXCORES"
-- 
cgit v1.2.3-55-g7522