svn path=/configurations/trunk/tud/; revision=25120
svn path=/configurations/trunk/tud/; revision=25120
Eelco Dolstra committed
Dec 14, 2010 at 11:58 UTC
1a00504f55f0056e5562e7af4be8d968907a6119
5 files changed
+8
-8
build-machines-common.nix
+1
-1
@@ -6,8 +6,8 @@
6
environment.nix = pkgs.nixSqlite;
7
8
boot.loader.grub.device = "/dev/sda";
9
+ boot.loader.grub.copyKernels = true;
10
boot.kernelPackages = pkgs.linuxPackages_2_6_32;
10
- boot.copyKernels = true;
11
12
fileSystems =
13
[ { mountPoint = "/";
build-machines-dell-1950.nix
+1
-1
@@ -5,7 +5,7 @@
5
{
6
require = [ ./build-machines-common.nix ];
7
8
- boot.initrd.extraKernelModules = [ "mptsas" "ext4" ];
8
+ boot.initrd.kernelModules = [ "mptsas" "ext4" ];
9
boot.kernelModules = [ "acpi-cpufreq" "kvm-intel" ];
10
11
nix.maxJobs = 8;
build-machines-hps.nix
+1
-1
@@ -5,7 +5,7 @@
5
{
6
require = [ ./build-machines-common.nix ];
7
8
- boot.initrd.extraKernelModules = ["3w_xxxx"];
8
+ boot.initrd.kernelModules = ["3w_xxxx"];
9
boot.kernelModules = ["kvm-intel"];
10
11
nix.maxJobs = 2;
mrhankey.nix
+2
-2
@@ -8,8 +8,8 @@ with pkgs.lib;
8
virtualisation.xen.enable = true;
9
virtualisation.xen.domain0MemorySize = 512;
10
11
- boot.grubDevice = "/dev/sda";
12
- boot.initrd.extraKernelModules = [ "mptbase" "mptscsih" "mptsas" ];
11
+ boot.loader.grub.device = "/dev/sda";
12
+ boot.initrd.kernelModules = [ "mptbase" "mptscsih" "mptsas" ];
13
14
fileSystems =
15
[ { mountPoint = "/";
webdsl.nix
+3
-3
@@ -13,7 +13,7 @@ in
13
{
14
require = [ ./common.nix ./couchdb.nix ] ;
15
16
- boot.initrd.extraKernelModules = [ "mptsas" ];
16
+ boot.initrd.kernelModules = [ "mptsas" ];
17
boot.kernelModules = ["acpi-cpufreq" "kvm-intel"];
18
19
nix.maxJobs = 4;
@@ -198,9 +198,9 @@ in
198
199
######## copied from common ###########
200
201
- boot.grubDevice = "/dev/sda";
201
+ boot.loader.grub.device = "/dev/sda";
202
+ boot.loader.grub.copyKernels = true;
203
boot.kernelPackages = pkgs.linuxPackages_2_6_29;
203
- boot.copyKernels = true;
204
205
swapDevices = [ { label = "swap"; } ];
206