From: Ulrich Dangel <mru@grml.org>
Date: Fri, 26 Nov 2010 20:20:08 +0000 (+0100)
Subject: Remove CONFIG_{QEMU,VMWARE} its handled in grml-x nowadays.
X-Git-Tag: v0.9.20~2
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=78d1364df253e1e553689737c2d52a8708fc2ebe

Remove CONFIG_{QEMU,VMWARE} its handled in grml-x nowadays.
---

diff --git a/autoconfig b/autoconfig
index 4fe6b3b..9cfa690 100644
--- a/autoconfig
+++ b/autoconfig
@@ -106,7 +106,6 @@ CONFIG_NETIPV6='yes'          # check for bootparam ipv6
 CONFIG_PARTCONF='yes'         # do we want partconf to work?
 CONFIG_PASSWD='yes'           # set password via bootparam passwd
 CONFIG_PCMCIA='no'            # check for pcmcia and start cardmgr
-CONFIG_QEMU='yes'             # qemu specific stuff
 CONFIG_SCRIPTS='yes'          # execute scripts from the scripts option
 CONFIG_SERVICES='yes'         # check for services to run, provided via bootparam
 CONFIG_SETKEYCODES='yes'      # run setkeycodes when bootoption setkeycodes found
@@ -119,7 +118,6 @@ CONFIG_TIME='yes'             # set clock, check for bootparam utc/gmt [only in
 CONFIG_TIMEZONE='yes'         # get bootparam 'tz' and set it as /etc/localtime [only in live-mode]
 CONFIG_TOHD='yes'             # bootoption tohd=...
 CONFIG_USERFSTAB='yes'        # check for username of uid 1000
-CONFIG_VMWARE='yes'           # vmware specific stuff (use xorg.conf.vmware)
 CONFIG_VNC='yes'              # check for bootparam vnc
 CONFIG_WELCOME='yes'          # play welcome sound (audio)
 CONFIG_WONDERSHAPER='yes'     # start wondershaper with options provided via bootparam
diff --git a/autoconfig.functions b/autoconfig.functions
index e224a56..ec87922 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -461,41 +461,6 @@ config_kernel(){
 }
 # }}}
 
-# {{{ vmware specific stuff
-config_vmware(){
-if checkbootparam 'novmware' ; then
-   ewarn "Skipping running vmware specific stuff as requested on boot commandline." ; eend 0
-else
-   if [ -z "$INSTALLED" ] ; then
-      if vmware-detect || checkbootparam "BOOT_IMAGE=vmware" ; 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
-      elif [ -r /proc/acpi/battery/BAT0/info -a -r /etc/X11/xorg.conf.virtualbox ] ; then
-         if grep -q 'OEM info:                innotek' /proc/acpi/battery/BAT0/info ; then
-            einfo 'Virtual Box: Copying /etc/X11/xorg.conf.virtualbox to /etc/X11/xorg.conf'
-            cp /etc/X11/xorg.conf.virtualbox /etc/X11/xorg.conf ; eend $?
-         fi
-      fi
-   fi
-fi
-}
-# }}}
-
-# {{{ qemu specific stuff
-config_qemu(){
-if checkbootparam 'qemu' ; then
-   if [ -r /etc/X11/xorg.conf.example ] ; then
-      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
-}
-# }}}
-
 # {{{ ld.so.cache + depmod
 config_ld_mod(){
 if [ -n "$INSTALLED" ]; then
diff --git a/grml-autoconfig b/grml-autoconfig
index f2a5524..963c1bf 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -117,10 +117,6 @@ checkvalue $CONFIG_TIME && config_time
 
 checkvalue $CONFIG_KERNEL &&  config_kernel
 
-checkvalue $CONFIG_VMWARE &&  config_vmware
-
-checkvalue $CONFIG_QEMU && config_qemu
-
 checkvalue $CONFIG_SMALL && config_small
 
 checkvalue $CONFIG_LD_MOD && config_ld_mod