From 358ea148ca2be5fe7d4e3db2a097d140c38bf099 Mon Sep 17 00:00:00 2001
From: mboelen <michael@cisofy.com>
Date: Wed, 3 Dec 2014 14:10:52 +0100
Subject: [PATCH] Added additional virtualization detection for NetBSD and
 OpenBSD

---
 include/functions | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/include/functions b/include/functions
index 840f7d4f..928f8042 100644
--- a/include/functions
+++ b/include/functions
@@ -601,8 +601,31 @@
 
             # Amazon EC2 Instance
             if [ -f /etc/ec2_version -a ! -z /etc/ec2_version ]; then ISVIRTUALMACHINE=1; VMTYPE="amazon-ec2"; VMFULLTYPE="Amazon AWS EC2 Instance"; fi
+
+
+            if [ ${ISVIRTUALMACHINE} -eq 2 ]; then
+                # Try common guest processes
+                logtext "Test: trying to guess virtual machine type by sysctl keys"
+
+                FIND=`sysctl -a | egrep "(hw.product|machdep.dmi.system-product)" | sed 's/ = /=/' | awk -F= '{ print $2 }'`
+                if [ ! "${FIND}" = "" ]; then
+                    case ${FIND} in
+                        "VirtualBox")
+                            ISVIRTUALMACHINE=1
+                            VMTYPE="virtualbox"
+                            VMFULLTYPE="Oracle VM VirtualBox"
+                        ;;
+                        *)
+                            logtext "Result: Found an unknown hardware type in hw.product sysctl key"
+                        ;;
+                    esac
+                fi
+
+            fi
+
         fi
 
+
         # Check final status
         if [ ${ISVIRTUALMACHINE} -eq 1 ]; then
             logtext "Result: found virtual machine (type: ${VMTYPE}, ${VMFULLTYPE})"
@@ -855,7 +878,7 @@
     Progress()
       {
         if [ ${CRONJOB} -eq 0 ]; then
-            ${ECHOCMD} -en "."
+            ${ECHOCMD} -n "."
         fi
       }