Author: viric
Date: Sun Mar 18 10:02:58 2012
New Revision: 33230
URL: https://nixos.org/websvn/nix/?rev=33230&sc=1
Log:
Fixing the mkOverride for the kernelPackages in crashdump (I misunderstood
mkOverride in the prev commit).
Adding an option on kernelParams for the postcrash kernel.
Modified:
nixos/trunk/modules/misc/crashdump.nix
Modified: nixos/trunk/modules/misc/crashdump.nix
==============================================================================
--- nixos/trunk/modules/misc/crashdump.nix Sun Mar 18 09:24:42 2012
(r33229)
+++ nixos/trunk/modules/misc/crashdump.nix Sun Mar 18 10:02:58 2012
(r33230)
@@ -4,6 +4,8 @@
let
crashdump = config.boot.crashDump;
+
+ kernelParams = concatStringsSep " " crashdump.kernelParams;
in
###### interface
{
@@ -31,6 +33,12 @@
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 @@
postBootCommands = ''
${pkgs.kexectools}/sbin/kexec -p /var/run/current-system/kernel \
--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 = [
"crashkernel=64M"
"nmi_watchdog=1"
];
- kernelPackages = mkOverride 200 (crashdump.kernelPackages // {
+ kernelPackages = mkOverride 50 (crashdump.kernelPackages // {
kernel = crashdump.kernelPackages.kernel.override
(attrs: {
extraConfig = (optionalString (attrs ? extraConfig)
attrs.extraConfig) +
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
