Add Option "AutoAddDevices" "off"

diff --git a/debian/changelog b/debian/changelog
index 73169bf..a624fe6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-x (0.4.4) unstable; urgency=low
+
+  * Add Option "AutoAddDevices" "off", as we do not want to depend on
+    running dbus/hal. See http://wiki.debian.org/XStrikeForce/InputHotplugGuide
+
+ -- Michael Prokop <mika@grml.org>  Mon, 20 Apr 2009 13:15:48 +0200
+
 grml-x (0.4.3) unstable; urgency=low
 
   * Use Option "DontZap" "false" by default, now as DontZap has become

diff --git a/etc/X11/xorg.conf.example b/etc/X11/xorg.conf.example
index a213cdb..3d869a7 100644 (file)
--- a/etc/X11/xorg.conf.example
+++ b/etc/X11/xorg.conf.example
@@ -21,6 +21,7 @@ Section "ServerLayout"
         InputDevice    "Keyboard0"  "CoreKeyboard"
         InputDevice    "USB Mouse"  "CorePointer"
         # InputDevice    "PS/2 Mouse" "CorePointer"
+        Option "AutoAddDevices" "off" # do not depend on running dbus/hal
 EndSection
 
 Section "ServerFlags"

diff --git a/etc/X11/xorg.conf.virtualbox b/etc/X11/xorg.conf.virtualbox
index b313a30..14463de 100644 (file)
--- a/etc/X11/xorg.conf.virtualbox
+++ b/etc/X11/xorg.conf.virtualbox
@@ -24,6 +24,7 @@ Section "ServerLayout"
         # InputDevice    "PS/2 Mouse"    "CorePointer"
         # No synaptics/alps touchpad present.
         # No serial mouse detected.
+        Option "AutoAddDevices" "off" # do not depend on running dbus/hal
 EndSection
 
 Section "ServerFlags"

diff --git a/etc/X11/xorg.conf.vmware b/etc/X11/xorg.conf.vmware
index 5c4ef69..52d0772 100644 (file)
--- a/etc/X11/xorg.conf.vmware
+++ b/etc/X11/xorg.conf.vmware
@@ -25,6 +25,7 @@ Section "ServerLayout"
         # InputDevice    "PS/2 Mouse"    "CorePointer"
         # No synaptics/alps touchpad present.
         # No serial mouse detected.
+        Option "AutoAddDevices" "off" # do not depend on running dbus/hal
 EndSection
 
 Section "ServerFlags"

diff --git a/grml-x b/grml-x
index fc9ff76..c36b04d 100755 (executable)
--- a/grml-x
+++ b/grml-x
@@ -698,6 +698,7 @@ 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