From 56d817b0b0f198d8102736d511593d42750fd014 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 15 Nov 2009 20:38:19 +0000 Subject: [PATCH] * X server: remove the udev hack. svn path=/nixos/branches/upstart-0.6/; revision=18358 --- modules/services/x11/xserver.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index be0fb3bcecf..ea6f0f8cf96 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -363,7 +363,7 @@ in optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions; jobs.xserver = - { startOn = if cfg.autorun then "started hal" else ""; + { startOn = if cfg.autorun then "started udev and started hal" else ""; environment = { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup @@ -379,14 +379,6 @@ in preStart = '' - # Ugly hack: wait until udev has started since the X server - # needs various devices. This would more properly be - # expressed as an Upstart dependency, but AFAIK in "start - # on" we can't express a logical AND. - while ! initctl status udev 2>&1 | grep -q running; do - sleep 1 - done - rm -f /var/run/opengl-driver ${# !!! The OpenGL driver depends on what's detected at runtime. if elem "nvidia" driverNames then ''