X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-x;h=8974f8e951f7901eb5b0e46f239bcc0bc7b1e827;hb=24b5db5c4997750580975cb9fcf1693ee5542cda;hp=2838769f500a186bd96676a4450505d4f71e03a7;hpb=438b5088f42956cf743d325082573671910e285f;p=grml-x.git

diff --git a/grml-x b/grml-x
index 2838769..8974f8e 100755
--- a/grml-x
+++ b/grml-x
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Mär 26 22:11:44 CEST 2007 [mika]
+# Latest change: Die Apr 03 21:18:57 CEST 2007 [mika]
 ################################################################################
 
 # debugging {{{
@@ -21,11 +21,12 @@
      [ -r /etc/grml_colors ] && . /etc/grml_colors
   fi
 
-  # some functions like getbootparam
-  if [ -r /etc/grml/script-functions ] ; then
+  # some functions like getBootParam
+  if [ -r /etc/grml/script-functions -a -r /etc/grml/sh-lib ] ; then
      source /etc/grml/script-functions
+     source /etc/grml/sh-lib
   else
-    echo 'Error: sourcing /etc/grml/script-functions failed. Exiting.'
+    echo 'Error: sourcing function files failed. Exiting.'
     exit 1
   fi
 
@@ -490,7 +491,7 @@ parse_options()
      # module handling
      MODULE=$o_module[2]
      if [ -z "$MODULE" ] ; then
-       MODULE="$(getbootparam xmodule 2>/dev/null)"
+       MODULE="$(getBootParam xmodule 2>/dev/null)"
        if [ -z "$MODULE" ] ; then
          MODULE=$(grep 'XFree86 v4 Server Module:' "${HWINFO_TMP}" | head -1 | awk '{print $5}')
          if [ -z "$MODULE" ] ; then
@@ -510,7 +511,7 @@ parse_options()
 
      MODE=$o_mode[2]
      if [ -z $MODE ] ; then
-       B_MODE="$(getbootparam xmode 2>/dev/null)"
+       B_MODE="$(getBootParam xmode 2>/dev/null)"
        if [ -n "$B_MODE" ] ; then
          MODES="Modes \"$B_MODE\""
          FORCE="yes"
@@ -727,6 +728,8 @@ Section "Screen"
         EndSubSection
 EndSection
 
+# Make sure you have the relevant Debian packages on your system
+# to be able to use DRI (libgl1-mesa-dri for example)
 Section "DRI"
         Mode 0666
 EndSection
@@ -744,6 +747,12 @@ EOX
 writeit() {
     XCONFTMP="/tmp/xconfig.$$"
     xconfig > $XCONFTMP
+    # we do not want to have two CorePointers, deactivate one therefore
+    if grep -Eq '^[[:space:]]+InputDevice[ ]+"USB Mouse"[ ]+"CorePointer"' $XCONFTMP ; then
+       if grep -Eq '^[[:space:]]+InputDevice[ ]+"PS/2 Mouse"[ ]+"CorePointer"' $XCONFTMP ; then
+          sed -i 's|InputDevice.*PS/2.*CorePointer|# & # deactivated to avoid two CorePointers|' $XCONFTMP
+       fi
+    fi
     [ -f $XCONFIG ] && sudo mv -f $XCONFIG $XCONFIG.old
     sudo mv $XCONFTMP $XCONFIG
     sudo chown root.root $XCONFIG