From: Michael Prokop <mika@grml.org>
Date: Mon, 5 Feb 2007 11:38:20 +0000 (+0100)
Subject: add check for /proc/xen in vmware-detection
X-Git-Tag: 0.6.14~1
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=a8499da7a5d9d61c0c818c567f90e4782d8bc2dd;hp=cc1a5bf0075ffe967e14feb21ec30c86b4b0f415

add check for /proc/xen in vmware-detection
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 004754a..5e0c39e 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mit Jän 24 10:33:23 CET 2007 [mika]
+# Latest change: Mon Feb 05 12:37:33 CET 2007 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -357,6 +357,7 @@ config_time(){
 # {{{ print kernel info
 config_kernel(){
   vmware-detect &>/dev/null && VMWARE="inside ${WHITE}VMWare${NORMAL}"
+  [ -d /proc/xen ] && VMWARE='' # vmware-detect returns '0' when running with a Xen-enabled kernel
   einfo "Running Linux Kernel $KERNEL $VMWARE" ; eend 0
   if [ -r /proc/cpuinfo ] ; then
      if egrep -q '^flags.*(vmx|svm)' /proc/cpuinfo ; then
diff --git a/debian/changelog b/debian/changelog
index f49e582..66ee66a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.6.13) unstable; urgency=low
+
+  * Make sure the 'running inside VMware' isn't printed when running
+    with a Xen-enabled kernel (which returns '0' for vmware-detect).
+
+ -- Michael Prokop <mika@grml.org>  Mon,  5 Feb 2007 12:37:37 +0100
+
 grml-autoconfig (0.6.12) unstable; urgency=low
 
   * Support detection of CPUs with support for virtualization (vmx/svm).