Do not test virtual machine status too early

This commit is contained in:
mboelen 2014-11-04 00:32:59 +01:00
parent 28b31b95c8
commit b81d3cc3e0
1 changed files with 6 additions and 4 deletions

10
lynis
View File

@ -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..."