nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Doh, forgot to commit.

Browse Source 
svn path=/nixos/trunk/; revision=22005
This commit is contained in:
Eelco Dolstra 2010-05-27 13:43:16 +00:00
parent 77a4004df1
commit 62675aa0cf
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/build-vms.nix
View File

@ -3,6 +3,7 @@
let pkgs = import nixpkgs { config = {}; inherit system; }; in
with pkgs;
with import ../lib/qemu-flags.nix;
rec {
@ -106,18 +107,8 @@ rec {
"${config.networking.hostName}\n"));
virtualisation.qemu.options =
lib.flip lib.concatMapStrings interfacesNumbered ({ first, second }:
"-net nic,vlan=${toString second},model=virtio " +
# Use 232.0.1.<vlan> as the multicast address to
# connect VMs on the same vlan, but allow it to
# be overriden using the $QEMU_MCAST_ADDR_<vlan>
# environment variable. The test driver sets
# this variable to prevent collisions between
# parallel builds.
"-net socket,vlan=${toString second},mcast=" +
"\${QEMU_MCAST_ADDR_${toString first}:-232.0.1.${toString first}:1234} "
);
lib.flip lib.concatMapStrings interfacesNumbered
({ first, second }: qemuNICFlags second first );
};
}
)
@ -126,7 +117,7 @@ rec {
in lib.listToAttrs nodes_;
# Zip two lists together. Should be moved to pkgs.lib.
zip = xs: ys:
if xs != [] && ys != [] then