Fix logical structure of config_vmware().

diff --git a/autoconfig.functions b/autoconfig.functions
index 2209e5f..4b603a5 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -389,10 +389,12 @@ if checkbootparam novmware ; then
    ewarn "Skipping running vmware specific stuff as requested on boot commandline." ; eend 0
 else
    if [ -z "$INSTALLED" ] ; then
-      if ! checkbootparam qemu || vmware-detect || stringinstring "BOOT_IMAGE=vmware " "$CMDLINE" ; then
-         if [ -r /etc/X11/xorg.conf.vmware ] ; then
-            einfo "VMware: Copying /etc/X11/xorg.conf.vmware to /etc/X11/xorg.conf"
-            cp /etc/X11/xorg.conf.vmware /etc/X11/xorg.conf ; eend $?
+      if vmware-detect || stringinstring "BOOT_IMAGE=vmware " "$CMDLINE" ; then
+              if ! checkbootparam qemu ; then
+            if [ -r /etc/X11/xorg.conf.vmware ] ; then
+               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
       fi
    fi

diff --git a/debian/changelog b/debian/changelog
index c1ccab4..4172b40 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-autoconfig (0.6.32) unstable; urgency=low
+
+  * Fix logical structure of config_vmware().
+
+ -- Michael Prokop <mika@grml.org>  Mon,  9 Apr 2007 13:40:40 +0200
+
 grml-autoconfig (0.6.31) unstable; urgency=low
 
   * language-functions: applied patch by Jan-Pieter Jacobs