Fix logical structure of config_vmware().

[grml-autoconfig.git] / autoconfig.functions

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