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

* Use the CFQ I/O scheduler, rather than the ‘none’ scheduler. This

Browse Source 
was already the case on Linux 2.6.32, but in newer kernels the CFQ
  scheduler is built as a module, so all block devices got the ‘none’
  scheduler instead.

svn path=/nixos/trunk/; revision=28972
This commit is contained in:
Eelco Dolstra 2011-09-02 13:19:45 +00:00
parent 8138feb630
commit 8b3fd3ed49
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ let kernel = config.boot.kernelPackages.kernel; in
default = true; default = true;
example = false; example = false;
description = '' description = ''
Whether to activate VESA video mode on boot Whether to activate VESA video mode on boot.
''; '';
}; };
@ -91,8 +91,7 @@ let kernel = config.boot.kernelPackages.kernel; in
}; };
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.";
}; };
@ -121,7 +120,10 @@ 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" ] ++ [ "splash=verbose"
# Force the Completely Fair Scheduler to be used by default.
"elevator=cfq"
] ++
optional config.boot.vesa "vga=0x317"; optional config.boot.vesa "vga=0x317";
boot.kernelModules = [ "loop" ]; boot.kernelModules = [ "loop" ];
@ -163,6 +165,9 @@ let kernel = config.boot.kernelPackages.kernel; in
# Unix domain sockets (needed by udev). # Unix domain sockets (needed by udev).
"unix" "unix"
# Provide the CFQ scheduler in the initrd.
"cfq_iosched"
# Misc. stuff. # Misc. stuff.
"pcips2" "serio" "atkbd" "xtkbd" "pcips2" "serio" "atkbd" "xtkbd"
]; ];
@ -170,7 +175,8 @@ let kernel = config.boot.kernelPackages.kernel; in
boot.initrd.kernelModules = boot.initrd.kernelModules =
[ # For LVM. [ # For LVM.
"dm_mod" "dm_mod"
# For usual AT keyboards
# For usual AT keyboards.
"i8042" "i8042"
]; ];