X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=autoconfig.functions;h=4a8b167619407add5dd8098ffc9a07a8beafd9e6;hb=bd414ee95f95b6c77d636aba947db0a16ab87618;hp=e659549e194b77c08ec70afcde932fbccfa959ad;hpb=a08b34912e982a01f7bf80bf35ae009af522b43a;p=grml-autoconfig.git

diff --git a/autoconfig.functions b/autoconfig.functions
index e659549..4a8b167 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -184,7 +184,8 @@ KVM=false
 VIRTUALBOX=false
 VMWARE=false
 
-if vmware-detect &>/dev/null; then
+if virt-what 2>/dev/null | grep -q 'vmware' || \
+  imvirt 2>/dev/null | grep -iq "vmware" ; then
   VIRTUAL=true; VMWARE=true; VIRTUAL_ENV='VMware'
 fi
 
@@ -212,12 +213,8 @@ fi
 config_log(){
 if checkbootparam 'log' || checkbootparam 'debug' ; then
    export DEBUG="/tmp/grml.log.`date +%Y%m%d`"
-   touch $DEBUG
-   einfo "Bootparameter log found. Log files: ${DEBUG} and /var/log/boot"
-   eindent
-     einfo "Starting bootlogd." # known to be *very* unreliable :(
-     bootlogd -r -c >>$DEBUG 2>&1 ; eend $?
-   eoutdent
+   touch "${DEBUG}"
+   einfo "Bootparameter log found, debug log file from grml-autoconfig available at '${DEBUG}'"
 else
    DEBUG="/dev/null"
 fi