diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-08 19:43:15 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-08 19:43:15 +0000 |
| commit | fdc51c2c97568582eb278023e55afcc28d0b10d3 (patch) | |
| tree | 7dc78f6c541d9f7ea848e83059a58a21edfbe570 /modules/system | |
| parent | 0446f652a291e6fd8924b9ba32974680d2bb18b7 (diff) | |
| download | nixpkgs-fdc51c2c97568582eb278023e55afcc28d0b10d3.tar nixpkgs-fdc51c2c97568582eb278023e55afcc28d0b10d3.tar.gz nixpkgs-fdc51c2c97568582eb278023e55afcc28d0b10d3.tar.bz2 nixpkgs-fdc51c2c97568582eb278023e55afcc28d0b10d3.tar.lz nixpkgs-fdc51c2c97568582eb278023e55afcc28d0b10d3.tar.xz nixpkgs-fdc51c2c97568582eb278023e55afcc28d0b10d3.tar.zst nixpkgs-fdc51c2c97568582eb278023e55afcc28d0b10d3.zip | |
* Disable all fbcondecor-related stuff if boot.vesa is disabled.
svn path=/nixos/trunk/; revision=30343
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/boot/kernel.nix | 6 | ||||
| -rw-r--r-- | modules/system/boot/stage-1.nix | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix index 9a482f242a1..acae7054ddf 100644 --- a/modules/system/boot/kernel.nix +++ b/modules/system/boot/kernel.nix @@ -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" ]; diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix index 08cf948fea4..af3642ac009 100644 --- a/modules/system/boot/stage-1.nix +++ b/modules/system/boot/stage-1.nix @@ -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 |