public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Make virtualisation.qemu.options a list.

Browse Source 
svn path=/nixos/trunk/; revision=28120
This commit is contained in:
Eelco Dolstra
2011-08-02 06:52:10 +00:00
parent d890e74d9c
commit 8aad8c536f
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/build-vms.nix
View File

@@ -76,7 +76,7 @@ rec {
"${config.networking.hostName}\n"));
virtualisation.qemu.options =
lib.flip lib.concatMapStrings interfacesNumbered
lib.flip map interfacesNumbered
({ first, second }: qemuNICFlags second first m.second);
};
}

5
lib/qemu-flags.nix
View File

@@ -3,7 +3,8 @@
{
qemuNICFlags = nic: net: machine:
"-net nic,vlan=${toString nic},macaddr=52:54:00:12:${toString net}:${toString machine},model=virtio " +
"-net vde,vlan=${toString nic},sock=$QEMU_VDE_SOCKET_${toString net} ";
[ "-net nic,vlan=${toString nic},macaddr=52:54:00:12:${toString net}:${toString machine},model=virtio"
"-net vde,vlan=${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}"
];
}