Check for VMWare using the CPUID (thanks: Chetan Loke).

[virt-what.git] / virt-what.in

diff --git a/virt-what.in b/virt-what.in
index 8ac09f5..313cd06 100644 (file)
--- a/virt-what.in
+++ b/virt-what.in
@@ -63,16 +63,33 @@ if [ "$uid" != 0 ]; then
     fail "this script must be run as root"
 fi
 
-PATH=/sbin:/usr/sbin:$PATH
+# Add /sbin and /usr/sbin to the path so we can find system
+# binaries like dmicode.
+# Add /usr/libexec to the path so we can find the helper binary.
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+PATH=@libexecdir@:/sbin:/usr/sbin:$PATH
+
+# Many fullvirt hypervisors give an indication through CPUID.  Use the
+# helper program to get this information.
+
+cpuid=`virt-what-cpuid-helper`
 
 # Check for various products in the BIOS information.
 
 dmi=`dmidecode 2>&1`
 
-if echo "$dmi" | grep -q 'Manufacturer: VMware'; then
+# Check for VMware.
+# cpuid check added by Chetan Loke.
+
+if [ "$cpuid" = "VMwareVMware" ]; then
+    echo vmware
+elif echo "$dmi" | grep -q 'Manufacturer: VMware'; then
     echo vmware
 fi
 
+# Check for VirtualPC.
+
 if echo "$dmi" | grep -q 'Manufacturer: Microsoft Corporation'; then
     echo virtualpc
 fi
@@ -96,14 +113,9 @@ fi
 # Check for UML.
 # Added by Laurent Léonard.
 if grep -q 'UML' /proc/cpuinfo; then
-    echo uml
+    echo uml
 fi
 
-# To tell if it is Xen and KVM HVM (fully virtualized) we can use this
-# helper C program.
-
-cpuid=`virt-what-cpuid-helper`
-
 # Check for Xen.
 
 if [ "$cpuid" = "XenVMMXenVMM" ]; then