swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-24 22:20:17 +02: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; system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
boot.kernelParams = boot.kernelParams =
[ "splash=verbose" optionals config.boot.vesa [ "splash=verbose" "vga=0x317" ];
# Force the Completely Fair Scheduler to be used by default.
#"elevator=cfq"
] ++
optional config.boot.vesa "vga=0x317";
boot.kernelModules = [ "loop" ]; boot.kernelModules = [ "loop" ];

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

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