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

* Remove most default kernel options since they have no effect. Also,

Browse Source 
don't put them in a default, so that they can easily be added to.

svn path=/nixos/trunk/; revision=19232
This commit is contained in:
Eelco Dolstra 2010-01-05 13:11:12 +00:00
parent d6b52e7236
commit 9889d9f9f8
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,14 +28,7 @@ let kernel = config.boot.kernelPackages.kernel; in
}; };
boot.kernelParams = mkOption { boot.kernelParams = mkOption {
default = [ default = [ ];
"selinux=0"
"apm=on"
"acpi=on"
"console=tty1"
"splash=verbose"
"vga=0x317"
];
description = '' description = ''
The kernel parameters. If you want to add additional The kernel parameters. If you want to add additional
parameters, it's best to set parameters, it's best to set
@ -116,6 +109,11 @@ let kernel = config.boot.kernelPackages.kernel; in
system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages; system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
boot.kernelParams =
[ "splash=verbose"
"vga=0x317"
];
boot.kernelModules = [ "loop" ]; boot.kernelModules = [ "loop" ];
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules =

1
tests/trac.nix
View File

@ -67,7 +67,6 @@
useDefaultShell = true; useDefaultShell = true;
password = "foobar"; password = "foobar";
}; };
environment.systemPackages = [ pkgs.scrot ];
}; };
}; };