From 1e16e6dee4cdcb4a9d2973a7289a3825b406129c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 15 May 2009 07:51:51 +0000
Subject: [PATCH] * Synced with trunk @ 15369 also adding missing assertion
 fixed in 15609

svn path=/nixos/branches/modular-nixos/; revision=15610
---
 upstart-jobs/xserver/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/upstart-jobs/xserver/default.nix b/upstart-jobs/xserver/default.nix
index 71eb34f34b60..80ea8c2a564b 100644
--- a/upstart-jobs/xserver/default.nix
+++ b/upstart-jobs/xserver/default.nix
@@ -465,6 +465,9 @@ let
 in
 
 mkIf cfg.enable {
+
+  assertions = [ { assertion = config.services.hal.enable == true; message = "The X server needs HAL running. Set services.hal.enable to true"; } ];
+
   require = [
     options
 
@@ -530,7 +533,7 @@ mkIf cfg.enable {
     extraJobs = [{
       name = "xserver";
       job = ''
-        start on ${if cfg.autorun then "network-interfaces" else "never"}
+        start on ${if cfg.autorun then "hal" else "never"}
 
         start script