X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=4b603a555753e23d7a4fae045801909e07b5bc80;hp=2209e5fbdddea620cde96d38bcaea07f16a6b8b3;hb=f09cbabaa035762292b3c3965b7e95550a73b867;hpb=8176561f66e1cd86ba0b744a51b28e2bf1d5b7ee diff --git a/autoconfig.functions b/autoconfig.functions index 2209e5f..4b603a5 100755 --- 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