X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-x;h=6cf4906a13a1f7b55c1892883ec46aba5dc0be26;hb=516a12154c2055e87016ad06fe13bf24242a190a;hp=85ec3f058b6f14c82ecefb6e5663b8342ec51c0e;hpb=f4af1d0fa3b017f9b5a458ef7515862cee4e7377;p=grml-x.git

diff --git a/grml-x b/grml-x
index 85ec3f0..6cf4906 100755
--- a/grml-x
+++ b/grml-x
@@ -39,9 +39,11 @@
   [ -n "$XINITRC" ] || XINITRC="$HOME/.xinitrc"
 
   # temporary files
-  HWINFO_TMP="$(mktemp)"
-  MONITORINFO="$(mktemp)"
-  MOUSEINFO="$(mktemp)"
+  # notice: we need the unsafe option, otherwise users other than root
+  # can not write to HWINFO_TMP, but we don't want to run hwinfo as root
+  HWINFO_TMP="$(mktemp -u)" || exit 1
+  MONITORINFO="$(mktemp)"   || exit 1
+  MOUSEINFO="$(mktemp)"     || exit 1
 
   if [ -z "$HWINFO_TMP" ] ; then
      echo "Fatal: could not create temporary file. Exiting.">&2
@@ -696,13 +698,14 @@ Section "ServerLayout"
         Screen      0  "Screen0" 0 0
         # InputDevice    "Keyboard0"     "CoreKeyboard"
         # InputDevice    "Generic Mouse" "CorePointer"
+        Option "AutoAddDevices" "off" # do not depend on running dbus/hal
 $MOUSE
 EndSection
 
 Section "ServerFlags"
         Option "AllowMouseOpenFail"  "true"  # allows the server to start up even if the mouse does not work
         Option "DontVTSwitch"        "false" # allow switching between virtual terminal
-        # Option "DontZap"             "true"  # disable <Crtl><Alt><BS> (server abort)
+        Option "DontZap"             "false" # enable <Crtl><Alt><BS> (server abort)
         # Option "DontZoom"            "true"  # disable <Crtl><Alt><KP_+>/<KP_-> (resolution switching)
 EndSection
 
@@ -721,16 +724,16 @@ Section "Module"
         Load  "dbe"       # double buffer extension
         Load  "dri"       # direct rendering
         Load  "glx"       # 3D layer / GLX extension
-        Load  "type1"     # type1 font module
-        Load  "freetype"  # freetype fonts rendering
         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  "freetype"  # freetype fonts rendering
         # Load  "i2c"       # I2C bus
         # Load  "int10"     # initialize graphics cards via int10 call to the BIOS
+        # Load  "type1"     # type1 font module
         # Load  "v4l"       # Video for Linux
+        # Load  "vbe"       # Vesa BIOS Extension
         ## Deprecated/unneeded modules with Xorg >=7.0:
         # Load  "speedo"    # font module (does not exist anymore)
         # Load  "ddc"       # ddc probing of monitor (automatically loaded)