svn path=/configurations/trunk/tud/; revision=22494
svn path=/configurations/trunk/tud/; revision=22494
Eelco Dolstra committed
Jul 6, 2010 at 11:43 UTC
714946bffce7b35a0bb011dca3c3ebc6db5cc345
2 files changed
+3
-7
cartman.nix
+3
-6
@@ -33,13 +33,10 @@ rec {
33
require = [ ./common.nix ];
34
35
boot = {
36
- grubDevice = "/dev/sda";
37
- initrd = {
38
- extraKernelModules = ["arcmsr"];
39
- };
36
+ loader.grub.device = "/dev/sda";
37
+ loader.grub.copyKernels = true;
38
+ initrd.kernelModules = ["arcmsr"];
39
kernelModules = ["kvm-intel"];
41
- kernelPackages = pkgs.linuxPackages_2_6_27;
42
- copyKernels = true;
40
};
41
42
fileSystems = [
hydra.nix
-1
@@ -23,7 +23,6 @@ in
23
boot = {
24
initrd.kernelModules = [ "uhci_hcd" "ehci_hcd" "ata_piix" "mptsas" "usbhid" "ext4" ];
25
kernelModules = [ "acpi-cpufreq" "kvm-intel" ];
26
- kernelPackages = pkgs.linuxPackages_2_6_32;
26
loader.grub.device = "/dev/sda";
27
loader.grub.copyKernels = true;
28
};