Author: simons Date: Wed Sep 7 20:36:13 2011 New Revision: 29101 URL: https://svn.nixos.org/websvn/nix/?rev=29101&sc=1
Log: modules/system/boot/kernel.nix: stripped trailing whitespace Modified: nixos/trunk/modules/system/boot/kernel.nix Modified: nixos/trunk/modules/system/boot/kernel.nix ============================================================================== --- nixos/trunk/modules/system/boot/kernel.nix Wed Sep 7 20:21:01 2011 (r29100) +++ nixos/trunk/modules/system/boot/kernel.nix Wed Sep 7 20:36:13 2011 (r29101) @@ -9,7 +9,7 @@ ###### interface options = { - + boot.kernelPackages = mkOption { default = pkgs.linuxPackages; # We don't want to evaluate all of linuxPackages for the manual @@ -89,7 +89,7 @@ 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 @@ 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 @@ # 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 @@ # Misc. stuff. "pcips2" "serio" "atkbd" "xtkbd" ]; - + boot.initrd.kernelModules = [ # For LVM. "dm_mod" - + # For usual AT keyboards. "i8042" @@ -184,5 +184,5 @@ hardware.firmware = [ "${kernel}/lib/firmware" ]; }; - + } _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits