From 38d7e7b780afb9ba9b7bee3a0c5783bb4ed3f69d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 28 Apr 2009 08:47:13 +0000
Subject: [PATCH] Sorry, I disabled X hal config in my last commit, thinking it
 was still not usable. I see the problem rests only in configuring the
 keyboard layout in hal, for X. Nevertheless, using the client "setxkbmap"
 works, which can help until we can configure the keyboard layout in
 configuration.nix.

svn path=/nixos/trunk/; revision=15348
---
 upstart-jobs/xserver.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index a8d2a70dfac..978b8739052 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -76,7 +76,8 @@ Section "ServerLayout"
   @setCorePointer@
   Screen       "Screen[0]"
   @serverLayoutOptions@
-  Option       "AutoAddDevices" "0"
+  # If you want to disable HAL-based configuration, set AutoAddDevices to 0
+  # Option       "AutoAddDevices" "0"
 EndSection