nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-18 11:44:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Disable all fbcondecor-related stuff if boot.vesa is disabled.

Browse Source 
svn path=/nixos/trunk/; revision=30343
This commit is contained in:
Eelco Dolstra 2011-11-08 19:43:15 +00:00
parent 0446f652a2
commit fdc51c2c97
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/system/boot/kernel.nix
View File

@ -120,11 +120,7 @@ let kernel = config.boot.kernelPackages.kernel; in
system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
boot.kernelParams =
[ "splash=verbose"
# Force the Completely Fair Scheduler to be used by default.
#"elevator=cfq"
] ++
optional config.boot.vesa "vga=0x317";
optionals config.boot.vesa [ "splash=verbose" "vga=0x317" ];
boot.kernelModules = [ "loop" ];

2
modules/system/boot/stage-1.nix
View File

@ -91,7 +91,7 @@ let
enableSplashScreen =
config.boot.initrd.enableSplashScreen && kernelPackages.splashutils != null;
config.boot.vesa && config.boot.initrd.enableSplashScreen && kernelPackages.splashutils != null;
# Some additional utilities needed in stage 1, like mount, lvm, fsck

8
modules/tasks/tty-backgrounds.nix
View File

@ -50,7 +50,7 @@ in
services.ttyBackgrounds = {
enable = mkOption {
default = splashutils != null;
default = true;
description = ''
Whether to enable graphical backgrounds for the virtual consoles.
'';
@ -82,11 +82,11 @@ in
###### implementation
config = mkIf config.services.ttyBackgrounds.enable (
mkAssert (splashutils != null) "
config = mkIf (config.boot.vesa && config.services.ttyBackgrounds.enable && splashutils != null) (
mkAssert (splashutils != null) ''
The kernelPackages does not provide splashutils, as required by ttyBackgrounds.
Either provide kernelPackages with splashutils, or disable ttyBackgrounds.
" {
'' {
services.ttyBackgrounds.specificThemes = singleton
{ tty = config.services.syslogd.tty;