JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enable noX11 on kernel cmdline to suppress start of X

Browse Source 
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
This commit is contained in:
Florian Friesdorf 2011-12-31 00:24:48 +00:00
parent 5b7e7bb429
commit 76986a24f9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/services/x11/xserver.nix
View File

@ -384,9 +384,15 @@ in
environment.pathsToLink = environment.pathsToLink =
[ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ]; [ "/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 ""; { 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 = environment =
{ FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.