From: Michael Prokop <mika@grml.org>
Date: Sun, 25 Mar 2007 13:53:46 +0000 (+0200)
Subject: Improve informational messages for VMware/Qemu
X-Git-Tag: 0.6.25
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=acf6153710aa0ac1b65a612ba21f44d79dc7d64c

Improve informational messages for VMware/Qemu
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 0f6351a..1507172 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -364,7 +364,7 @@ config_time(){
 
 # {{{ print kernel info
 config_kernel(){
-  vmware-detect &>/dev/null && VMWARE="inside ${WHITE}VMWare${NORMAL}"
+  vmware-detect &>/dev/null && VMWARE="inside ${WHITE}VMware/Qemu${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
@@ -391,7 +391,7 @@ else
       if ! checkbootparam qemu ; then
          if vmware-detect ; then
             if [ -r /etc/X11/xorg.conf.vmware ] ; then
-               einfo "Copying /etc/X11/xorg.conf.vmware to /etc/X11/xorg.conf"
+               einfo "VMware: Copying /etc/X11/xorg.conf.vmware to /etc/X11/xorg.conf"
                cp /etc/X11/xorg.conf.vmware /etc/X11/xorg.conf ; eend $?
             fi
 	 fi
@@ -405,7 +405,7 @@ fi
 config_qemu(){
 if checkbootparam qemu ; then
    if [ -r /etc/X11/xorg.conf.example ] ; then
-      einfo "Copying /etc/X11/xorg.conf.example to /etc/X11/xorg.conf"
+      einfo "Qemu: Copying /etc/X11/xorg.conf.example to /etc/X11/xorg.conf"
       cp /etc/X11/xorg.conf.example /etc/X11/xorg.conf ; eend $?
    fi
 fi
diff --git a/debian/changelog b/debian/changelog
index e8cb5c3..18d6125 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-autoconfig (0.6.25) unstable; urgency=low
+
+  * Improve informational messages for VMware/Qemu. 
+
+ -- Michael Prokop <mika@grml.org>  Sun, 25 Mar 2007 15:53:28 +0200
+
 grml-autoconfig (0.6.24) unstable; urgency=low
 
   * config_vmware(): fix small syntax error.