From 021c65da98aa6298e0f8c238ddae1a1bb80d6ca5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Jun 2009 08:14:54 +0000
Subject: [PATCH] * Quick hack in the X server job: wait until udev is running,
 since we   need some devices.  In particular this fixes the "Cannot open  
 virtual console 7" errors in VirtualBox.  (There's nothing special   about
 VirtualBox, but the different timing makes it more likely to   trigger this
 bug.)

svn path=/nixos/branches/modular-nixos/; revision=15836
---
 modules/services/x11/xserver/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index 954c267b83f..acaea17649c 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -538,6 +538,14 @@ mkIf cfg.enable {
         start on ${if cfg.autorun then "hal" else "never"}
 
         start script
+
+          # 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
           ${if videoDriver == "nvidia"