diff options
author | Peter Simons <simons@cryp.to> | 2011-09-07 20:36:13 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2011-09-07 20:36:13 +0000 |
commit | 6c08bf40a6f1916cb4ab1511befebb4bb258693e (patch) | |
tree | 0a5bc5b5336f670b5656ff152a0f5c37b9acc5d0 /modules/system/boot/kernel.nix | |
parent | 5925797672c04b7308cc9e2952e6925ba7e1316b (diff) | |
download | nixpkgs-6c08bf40a6f1916cb4ab1511befebb4bb258693e.tar nixpkgs-6c08bf40a6f1916cb4ab1511befebb4bb258693e.tar.gz nixpkgs-6c08bf40a6f1916cb4ab1511befebb4bb258693e.tar.bz2 nixpkgs-6c08bf40a6f1916cb4ab1511befebb4bb258693e.tar.lz nixpkgs-6c08bf40a6f1916cb4ab1511befebb4bb258693e.tar.xz nixpkgs-6c08bf40a6f1916cb4ab1511befebb4bb258693e.tar.zst nixpkgs-6c08bf40a6f1916cb4ab1511befebb4bb258693e.zip |
modules/system/boot/kernel.nix: stripped trailing whitespace
svn path=/nixos/trunk/; revision=29101
Diffstat (limited to 'modules/system/boot/kernel.nix')
-rw-r--r-- | modules/system/boot/kernel.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix index 87fb7bcbd5e..a5266bb0a82 100644 --- a/modules/system/boot/kernel.nix +++ b/modules/system/boot/kernel.nix @@ -9,7 +9,7 @@ let kernel = config.boot.kernelPackages.kernel; in ###### interface options = { - + boot.kernelPackages = mkOption { default = pkgs.linuxPackages; # 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>. ''; }; - + boot.initrd.kernelModules = mkOption { default = []; description = "List of modules that are always loaded by the initrd."; @@ -116,16 +116,16 @@ let kernel = config.boot.kernelPackages.kernel; in config = { system.build = { inherit kernel; }; - + 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"; - + boot.kernelModules = [ "loop" ]; 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 # compatibility. - # Some SATA/PATA stuff. + # Some SATA/PATA stuff. "ahci" "sata_nv" "sata_via" @@ -168,11 +168,11 @@ let kernel = config.boot.kernelPackages.kernel; in # Misc. stuff. "pcips2" "serio" "atkbd" "xtkbd" ]; - + boot.initrd.kernelModules = [ # For LVM. "dm_mod" - + # For usual AT keyboards. "i8042" @@ -184,5 +184,5 @@ let kernel = config.boot.kernelPackages.kernel; in hardware.firmware = [ "${kernel}/lib/firmware" ]; }; - + } |