Author: eelco Date: 2010-07-06 11:43:29 +0000 (Tue, 06 Jul 2010) New Revision: 22494
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22494&view=rev Modified: configurations/trunk/tud/cartman.nix configurations/trunk/tud/hydra.nix Log: Changes: Modified: configurations/trunk/tud/cartman.nix =================================================================== --- configurations/trunk/tud/cartman.nix 2010-07-06 11:12:33 UTC (rev 22493) +++ configurations/trunk/tud/cartman.nix 2010-07-06 11:43:29 UTC (rev 22494) @@ -33,13 +33,10 @@ require = [ ./common.nix ]; boot = { - grubDevice = "/dev/sda"; - initrd = { - extraKernelModules = ["arcmsr"]; - }; + loader.grub.device = "/dev/sda"; + loader.grub.copyKernels = true; + initrd.kernelModules = ["arcmsr"]; kernelModules = ["kvm-intel"]; - kernelPackages = pkgs.linuxPackages_2_6_27; - copyKernels = true; }; fileSystems = [ Modified: configurations/trunk/tud/hydra.nix =================================================================== --- configurations/trunk/tud/hydra.nix 2010-07-06 11:12:33 UTC (rev 22493) +++ configurations/trunk/tud/hydra.nix 2010-07-06 11:43:29 UTC (rev 22494) @@ -23,7 +23,6 @@ boot = { initrd.kernelModules = [ "uhci_hcd" "ehci_hcd" "ata_piix" "mptsas" "usbhid" "ext4" ]; kernelModules = [ "acpi-cpufreq" "kvm-intel" ]; - kernelPackages = pkgs.linuxPackages_2_6_32; loader.grub.device = "/dev/sda"; loader.grub.copyKernels = true; }; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
