Author: eelco
Date: Thu Mar 22 12:22:44 2012
New Revision: 33355
URL: https://nixos.org/websvn/nix/?rev=33355&sc=1
Log:
* Retire Xen.
Modified:
configurations/trunk/tud/common.nix
configurations/trunk/tud/machines.nix
configurations/trunk/tud/mrhankey.nix
Modified: configurations/trunk/tud/common.nix
==============================================================================
--- configurations/trunk/tud/common.nix Thu Mar 22 11:17:49 2012 (r33354)
+++ configurations/trunk/tud/common.nix Thu Mar 22 12:22:44 2012 (r33355)
@@ -5,6 +5,8 @@
boot.kernelModules = [ "coretemp" ];
+ boot.supportedFilesystems = [ "nfs" ];
+
boot.initrd.kernelModules = [ "ext4" ];
environment.systemPackages =
Modified: configurations/trunk/tud/machines.nix
==============================================================================
--- configurations/trunk/tud/machines.nix Thu Mar 22 11:17:49 2012
(r33354)
+++ configurations/trunk/tud/machines.nix Thu Mar 22 12:22:44 2012
(r33355)
@@ -9,12 +9,14 @@
aliases = ["main"];
maxJobs = 2;
}
-
+
+ /*
{ # APC UPS.
hostName = "ups";
ipAddress = "192.168.1.6";
ethernetAddress = "00:c0:b7:5b:16:56";
}
+ */
{ # 8-core NixOS build machine.
hostName = "kenny";
Modified: configurations/trunk/tud/mrhankey.nix
==============================================================================
--- configurations/trunk/tud/mrhankey.nix Thu Mar 22 11:17:49 2012
(r33354)
+++ configurations/trunk/tud/mrhankey.nix Thu Mar 22 12:22:44 2012
(r33355)
@@ -7,8 +7,8 @@
nixpkgs.system = "x86_64-linux";
- virtualisation.xen.enable = true;
- virtualisation.xen.domain0MemorySize = 512;
+ #virtualisation.xen.enable = true;
+ #virtualisation.xen.domain0MemorySize = 512;
boot.loader.grub.device = "/dev/sda";
boot.initrd.kernelModules = [ "mptbase" "mptscsih" "mptsas" ];
@@ -25,19 +25,4 @@
networking.hostName = "";
services.openssh.enable = true;
-
- environment.etc =
- flip map (range 0 9) (nr:
- { source = pkgs.writeText "agilecloud0${toString nr}"
- ''
- from xen.util.path import *
- memory = 512
- kernel = XENFIRMWAREDIR + '/pv-grub-x86_32.gz'
- extra = '(hd0)/boot/grub/menu.lst'
- disk = [ 'file:/vmdisks/agilecloud-0${toString
nr}-root.img,xvda1,w' ]
- vif = [ 'mac=00:16:3e:00:34:0${toString nr}' ]
- '';
- target = "xen/agilecloud0${toString nr}";
- }
- );
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
