X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-x;h=62d2c5ae979ad5a5c9a7bd5ef56da238cce6c0be;hb=adb532e01c23f7bf87da537310d06d58ad2c8a94;hp=9a5fa0c3b954cbfa0dba428b03ad5cfbee48caa9;hpb=78b24d197af367d31f65981047a1e2b031aed865;p=grml-x.git

diff --git a/grml-x b/grml-x
index 9a5fa0c..62d2c5a 100755
--- a/grml-x
+++ b/grml-x
@@ -294,7 +294,7 @@ mouse()
    if grep -q 'Device:.*Synaptics' "$MOUSEINFO" ; then
     if [[ "$SYNAPTICS" == "yes" ]] ; then # check for '-nosynaptics'-option
      MOUSEDRIVER='synaptics'
-     SYNMOUSE='InputDevice    "Synaptics"  "AlwaysCore"'
+     SYNMOUSE='InputDevice    "Synaptics" # "AlwaysCore"'
      SYNMOUSEDETAIL="
 Section \"InputDevice\"
   Driver        \"synaptics\"
@@ -329,7 +329,7 @@ EndSection
     if grep -q 'Device:.*ALPS' "$MOUSEINFO" ; then
      if [[ "$SYNAPTICS" == "yes" ]] ; then # check for '-nosynaptics'-option
       MOUSEDRIVER='synaptics'
-      SYNMOUSE='InputDevice    "Synaptics"  "AlwaysCore"'
+      SYNMOUSE='InputDevice    "Synaptics" # "AlwaysCore"'
       SYNMOUSEDETAIL="
 Section \"InputDevice\"
   Driver        \"synaptics\"
@@ -720,7 +720,7 @@ $XFONTS
         FontPath     "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
 EndSection
 
-# Modules - see /usr/X11R6/lib/modules/fonts and /usr/X11R6/lib/modules/extensions
+# Modules - see /usr/lib/xorg/modules/fonts and /usr/lib/xorg/modules/extensions
 Section "Module"
         Load  "dbe"       # double buffer extension
         Load  "dri"       # direct rendering
@@ -730,6 +730,7 @@ Section "Module"
         Load  "extmod"    # some commonly used server extensions (e.g. shape extension)
         Load  "record"    # recording extension
         Load  "evdev"     # generic input handling driver on Linux
+        Load  "xtrap"     # X Trap extension
         # Load  "vbe"       # Vesa BIOS Extension
         # Load  "i2c"       # I2C bus
         # Load  "int10"     # initialize graphics cards via int10 call to the BIOS
@@ -892,6 +893,11 @@ $fg[red]"
 function runit
 {
   writeconfig
+  if [ "$(readlink /etc/X11/X)" = /bin/true ] ; then
+     print "$bold_color$fg[red]Fatal: /etc/X11/X is a symlink to /bin/true."
+     print "Fix it via running 'ln -sf /usr/bin/Xorg /etc/X11/X'"
+     exit 10
+  fi
   if [ -z "$NOSTART" ] ; then
     print "$reset_color"
     if [ -x /etc/init.d/xorg-common ] ; then