From c51025b2a24e7b94733bfe3ef6b4646c7b1e1ed1 Mon Sep 17 00:00:00 2001
From: Dirk
Date: Fri, 28 Oct 2011 19:32:39 +0200
Subject: Feature selection was too late in run-virt.include ...

---
 .../plugins/vmware/files/run-virt.include          | 49 +++++++++++-----------
 1 file changed, 24 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include
index 8da908e5..db8ad234 100644
--- a/src/os-plugins/plugins/vmware/files/run-virt.include
+++ b/src/os-plugins/plugins/vmware/files/run-virt.include
@@ -52,8 +52,31 @@ ehci.present = \"TRUE\"
 mks.enable3d = \"${enable3d}\"" >>${conffile}
   ;;
 esac
+# check for the ostype
+case "${vmostype}" in
+  winxp*|windowsxp*)
+  ;;
+  winvista*|windowsvista*)
+  ;;
+  windows7*)
+  ;;
+  linux*|*ubuntu*|*suse*|debian*|*sci*)
+    vmostype="linux"
+  ;;
+  macos*)
+    cpu_cores="1"
+    vmostype="other"
+  ;;
+  beos*)
+    cpu_cores="1"
+    vmostype="other"
+  ;;
+  *)
+    vmostype="other"
+  ;;
+esac
 case "$vmversion" in
-  3.*|7.*)
+  3.*|7.*|8.*)
     numvcpus="${cpu_cores}"
     if [ "${cpu_cores}" -ge "4" 2>/dev/null ]; then
     	numvcpus="4"
@@ -362,30 +385,6 @@ case "${hddrv}" in
     ;;
 esac
 
-# check for the ostype
-case "${vmostype}" in
-  winxp*|windowsxp*)
-  ;;
-  winvista*|windowsvista*)
-  ;;
-  windows7*)
-  ;;
-  linux*|*ubuntu*|*suse*|debian*|*sci*)
-    vmostype="linux"
-  ;;
-  macos*)
-    numvcpus="1"
-    vmostype="other"
-  ;;
-  beos*)
-    numvcpus="1"
-    vmostype="other"
-  ;;
-  *)
-    vmostype="other"
-  ;;
-esac
-
 # write configuration files
 ################################################################################
 
-- 
cgit v1.2.3-55-g7522