From b81d3cc3e02c326bf6ed5f1e22ad8152cbc134dd Mon Sep 17 00:00:00 2001
From: mboelen <michael@cisofy.com>
Date: Tue, 4 Nov 2014 00:32:59 +0100
Subject: [PATCH] Do not test virtual machine status too early

---
 lynis | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lynis b/lynis
index 16fb09ba..c5ceef2f 100755
--- a/lynis
+++ b/lynis
@@ -468,8 +468,6 @@
     report "os_version=${OS_VERSION}"
     if [ "${OS}" = "Linux" ]; then report "linux_version=${LINUX_VERSION}"; fi
     report "hostname=${HOSTNAME}"
-    # Check if this system is a virtual machine
-    IsVirtualMachine
 #
 #################################################################################
 #
@@ -487,7 +485,6 @@
         if [ ! "${OS_MODE}" = "" ]; then echo "  Operating system mode:     ${OS_MODE}"; fi
         echo "  Kernel version:            ${OS_KERNELVERSION}"
         echo "  Hardware platform:         ${HARDWARE}"
-        echo "  Virtual machine:           ${VMFULLTYPE}"
         echo "  Hostname:                  ${HOSTNAME}"
         echo "  Auditor:                   ${AUDITORNAME}"
         echo "  Profile:                   ${PROFILE}"
@@ -509,7 +506,6 @@
       logtext "Kernel version (full):     ${OS_KERNELVERSION_FULL}"
     fi
     logtext "Hardware platform:         ${HARDWARE}"
-    logtext "Virtual machine:           ${VMFULLTYPE}"
     logtext "Hostname:                  ${HOSTNAME}"
     logtext "Auditor:                   ${AUDITORNAME}"
     logtext "Profile:                   ${PROFILE}"
@@ -614,6 +610,12 @@
 #
 #################################################################################
 #
+    # Check if this is a virtual machine (after the appropriate binaries are found)
+    IsVirtualMachine
+#
+#################################################################################
+#
+
     logtextbreak
     InsertPluginSection "Plugins (phase 1)"
     logtext "Searching plugins..."