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

modules/system/boot/kernel.nix: stripped trailing whitespace

Browse Source 
svn path=/nixos/trunk/; revision=29101
This commit is contained in:
Peter Simons 2011-09-07 20:36:13 +00:00
parent 5925797672
commit 6c08bf40a6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ let kernel = config.boot.kernelPackages.kernel; in
###### interface ###### interface
options = { options = {
boot.kernelPackages = mkOption { boot.kernelPackages = mkOption {
default = pkgs.linuxPackages; default = pkgs.linuxPackages;
# We don't want to evaluate all of linuxPackages for the manual # We don't want to evaluate all of linuxPackages for the manual
@ -89,7 +89,7 @@ let kernel = config.boot.kernelPackages.kernel; in
include it in <option>boot.initrd.kernelModules</option>. include it in <option>boot.initrd.kernelModules</option>.
''; '';
}; };
boot.initrd.kernelModules = mkOption { boot.initrd.kernelModules = mkOption {
default = []; default = [];
description = "List of modules that are always loaded by the initrd."; description = "List of modules that are always loaded by the initrd.";
@ -116,16 +116,16 @@ let kernel = config.boot.kernelPackages.kernel; in
config = { config = {
system.build = { inherit kernel; }; system.build = { inherit kernel; };
system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages; system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
boot.kernelParams = boot.kernelParams =
[ "splash=verbose" [ "splash=verbose"
# Force the Completely Fair Scheduler to be used by default. # Force the Completely Fair Scheduler to be used by default.
"elevator=cfq" "elevator=cfq"
] ++ ] ++
optional config.boot.vesa "vga=0x317"; optional config.boot.vesa "vga=0x317";
boot.kernelModules = [ "loop" ]; boot.kernelModules = [ "loop" ];
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules =
@ -134,7 +134,7 @@ let kernel = config.boot.kernelPackages.kernel; in
# detects them, but I'm keeping them for now for backwards # detects them, but I'm keeping them for now for backwards
# compatibility. # compatibility.
# Some SATA/PATA stuff. # Some SATA/PATA stuff.
"ahci" "ahci"
"sata_nv" "sata_nv"
"sata_via" "sata_via"
@ -168,11 +168,11 @@ let kernel = config.boot.kernelPackages.kernel; in
# Misc. stuff. # Misc. stuff.
"pcips2" "serio" "atkbd" "xtkbd" "pcips2" "serio" "atkbd" "xtkbd"
]; ];
boot.initrd.kernelModules = boot.initrd.kernelModules =
[ # For LVM. [ # For LVM.
"dm_mod" "dm_mod"
# For usual AT keyboards. # For usual AT keyboards.
"i8042" "i8042"
@ -184,5 +184,5 @@ let kernel = config.boot.kernelPackages.kernel; in
hardware.firmware = [ "${kernel}/lib/firmware" ]; hardware.firmware = [ "${kernel}/lib/firmware" ];
}; };
} }