mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-13 17:23:08 +00:00
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
This commit is contained in:
parent
5b7e7bb429
commit
76986a24f9
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user