From: Michael Prokop <mika@grml.org>
Date: Thu, 27 Dec 2007 22:59:10 +0000 (+0100)
Subject: Support /etc/X11/xorg.conf.virtualbox in config_vmware()
X-Git-Tag: 0.8.0~1
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=96f0acb0fde94c5166d985cdb63c8be3f500eb34

Support /etc/X11/xorg.conf.virtualbox in config_vmware()
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 45604c9..42c80f2 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Fre Nov 16 08:45:53 CET 2007 [mika]
+# Latest change: Don Dez 27 23:58:27 CET 2007 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -395,12 +395,17 @@ if checkbootparam novmware ; then
 else
    if [ -z "$INSTALLED" ] ; then
       if vmware-detect || stringinstring "BOOT_IMAGE=vmware " "$CMDLINE" ; then
-              if ! checkbootparam qemu ; 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
diff --git a/debian/changelog b/debian/changelog
index 50035dc..d6c46a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-autoconfig (0.8.0) unstable; urgency=low
+
+  * Support /etc/X11/xorg.conf.virtualbox in config_vmware()
+
+ -- Michael Prokop <mika@grml.org>  Thu, 27 Dec 2007 23:58:48 +0100
+
 grml-autoconfig (0.7.32) unstable; urgency=low
 
   * Fix typo in manpage. Thanks to eModul for reporting!