From 76986a24f98f5ea303159cc9611a8a72eed376e4 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 00:24:48 +0000
Subject: [PATCH] enable noX11 on kernel cmdline to suppress start of X

xserver is started on start_xserver event, which is emitted by
check_for_xserver_start if there is no "noX11" on the kernel cmdline.

Thanks to viric for the general idea.

svn path=/nixos/trunk/; revision=31166
---
 modules/services/x11/xserver.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index cbd0741c844..d07ca53e145 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -384,9 +384,15 @@ in
     environment.pathsToLink =
       [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
 
-    jobs.xserver =
+    jobs.check_for_xserver_start =
       { startOn = if cfg.autorun then "filesystem and stopped udevtrigger" else "";
+        stopOn = "";
+        task = true;
+        script = "grep -qv noX11 /proc/cmdline && initctl emit start_xserver || true";
+      };
 
+    jobs.xserver =
+      { startOn = "start_xserver";
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
             XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.