X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=ea906fb0f743bbee655a1e682a3b2c2780f6b6b2;hp=cb9b1df8f7e694636533644eb2b0ec0c36f73fae;hb=494796bf66064d463792258eb990ff4f0b89a8f8;hpb=4c94aac0103471c3156be2e2cfd88b2441fdcd2d

diff --git a/autoconfig.functions b/autoconfig.functions
index cb9b1df..ea906fb 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -385,16 +385,29 @@ config_kernel(){
 # {{{ vmware specific stuff
 config_vmware(){
 if checkbootparam novmware ; then
- ewarn "Skipping running vmware specific stuff as requested on boot commandline." ; eend 0
+   ewarn "Skipping running vmware specific stuff as requested on boot commandline." ; eend 0
 else
- if [ -z "$INSTALLED" ]; 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"
-      cp /etc/X11/xorg.conf.vmware /etc/X11/xorg.conf ; eend $?
-    fi
-  fi
- fi
+   if [ -z "$INSTALLED" ] ; then
+      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"
+               cp /etc/X11/xorg.conf.vmware /etc/X11/xorg.conf ; eend $?
+            fi
+	 fi
+      fi
+   fi
+fi
+}
+# }}}
+
+# {{{ qemu specific stuff
+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"
+      cp /etc/X11/xorg.conf.example /etc/X11/xorg.conf ; eend $?
+   fi
 fi
 }
 # }}}
@@ -1200,7 +1213,8 @@ if checkbootparam "nocpu"; then
 else
   if ! [ -x /etc/init.d/powernowd ] ; then
     ewarn "Skipping CPU detection as powernowd dependencies are not fulfilled." ; eend 1
-  elif [ ! -e /lib/modules/${KERNEL}/kernel/arch/i386/kernel/cpu/cpufreq -o ! -e /lib/modules/${KERNEL}/kernel/drivers/cpufreq ] ; then
+  elif [ ! -e /lib/modules/${KERNEL}/kernel/arch/i386/kernel/cpu/cpufreq -o ! -e /lib/modules/${KERNEL}/kernel/drivers/cpufreq -o ! -e \
+         /lib/modules/${KERNEL}/kernel/arch/x86_64/kernel/cpufreq ] ; then
     ewarn "Skipping CPU detection as module dependencies are not fulfilled." ; eend 1
   else
     if [[ `grep -c processor /proc/cpuinfo` -gt 1 ]] ; then