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

Fixing the mkOverride for the kernelPackages in crashdump (I misunderstood

Browse Source 
mkOverride in the prev commit).

Adding an option on kernelParams for the postcrash kernel.


svn path=/nixos/trunk/; revision=33230
This commit is contained in:
Lluís Batlle i Rossell 2012-03-18 10:02:58 +00:00
parent c5a8d53d95
commit b78ac9e108
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/misc/crashdump.nix
View File

@ -4,6 +4,8 @@ with pkgs.lib;
let let
crashdump = config.boot.crashDump; crashdump = config.boot.crashDump;
kernelParams = concatStringsSep " " crashdump.kernelParams;
in in
###### interface ###### interface
{ {
@ -31,6 +33,12 @@ in
kernel configuration parameters for the crash dump to work. kernel configuration parameters for the crash dump to work.
''; '';
}; };
kernelParams = mkOption {
default = [ "debug1devices" ];
description = ''
Parameters that will be passed to the kernel kexec-ed on crash.
'';
};
}; };
}; };
}; };
@ -42,13 +50,13 @@ in
postBootCommands = '' postBootCommands = ''
${pkgs.kexectools}/sbin/kexec -p /var/run/current-system/kernel \ ${pkgs.kexectools}/sbin/kexec -p /var/run/current-system/kernel \
--initrd=/var/run/current-system/initrd \ --initrd=/var/run/current-system/initrd \
--append="init=$(readlink -f /var/run/current-system/init) system=$(readlink -f /var/run/current-system) debug1devices irqpoll maxcpus=1 reset_devices" --reset-vga --console-vga --append="init=$(readlink -f /var/run/current-system/init) system=$(readlink -f /var/run/current-system) irqpoll maxcpus=1 reset_devices ${kernelParams}" --reset-vga --console-vga
''; '';
kernelParams = [ kernelParams = [
"crashkernel=64M" "crashkernel=64M"
"nmi_watchdog=1" "nmi_watchdog=1"
]; ];
kernelPackages = mkOverride 200 (crashdump.kernelPackages // { kernelPackages = mkOverride 50 (crashdump.kernelPackages // {
kernel = crashdump.kernelPackages.kernel.override kernel = crashdump.kernelPackages.kernel.override
(attrs: { (attrs: {
extraConfig = (optionalString (attrs ? extraConfig) attrs.extraConfig) + extraConfig = (optionalString (attrs ? extraConfig) attrs.extraConfig) +