diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-05 17:08:57 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-05 17:08:57 +0000 |
| commit | bc238be01a6d812d06784464bac99a5ac135acaa (patch) | |
| tree | fe39faa18b18f2ffbb2d1faac08f95459e6be86b /lib | |
| parent | 73668f41dafd3570987fef58808f125a1534c8c7 (diff) | |
| download | nixlib-bc238be01a6d812d06784464bac99a5ac135acaa.tar nixlib-bc238be01a6d812d06784464bac99a5ac135acaa.tar.gz nixlib-bc238be01a6d812d06784464bac99a5ac135acaa.tar.bz2 nixlib-bc238be01a6d812d06784464bac99a5ac135acaa.tar.lz nixlib-bc238be01a6d812d06784464bac99a5ac135acaa.tar.xz nixlib-bc238be01a6d812d06784464bac99a5ac135acaa.tar.zst nixlib-bc238be01a6d812d06784464bac99a5ac135acaa.zip | |
* Factor out the X11 configuration.
svn path=/nixos/trunk/; revision=19241
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/build-vms.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/lib/build-vms.nix b/lib/build-vms.nix index 473bd01ad937..11eed8e23398 100644 --- a/lib/build-vms.nix +++ b/lib/build-vms.nix @@ -54,21 +54,11 @@ rec { import ./eval-config.nix { inherit nixpkgs services system; modules = configurations ++ - [ ../modules/virtualisation/qemu-vm.nix # !!! + [ ../modules/virtualisation/qemu-vm.nix ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs + { key = "no-manual"; services.nixosManual.enable = false; } ]; extraArgs = { inherit nodes; }; - /* !!! bug in the module/option handling: this ignores the - config from assignIPAddresses. Too much magic. - configuration = { - imports = [configuration "${nixos}/modules/virtualisation/qemu-vm.nix"]; - config = { - # We don't need the manual in a test VM, and leaving it out - # speeds up evaluation quite a bit. - services.nixosManual.enable = false; - }; - }; - */ }; @@ -88,7 +78,8 @@ rec { hosts = lib.concatMapStrings (m: "${m.second} ${m.first}\n") machinesWithIP; nodes_ = map (m: lib.nameValuePair m.first [ - { config = + { key = "ip-address"; + config = { networking.hostName = m.first; networking.interfaces = [ { name = "eth1"; @@ -96,7 +87,6 @@ rec { } ]; networking.extraHosts = hosts; - services.nixosManual.enable = false; # !!! }; } (lib.getAttr m.first nodes) |