Author: eelco
Date: Thu Feb 17 13:00:55 2011
New Revision: 26009
URL: https://svn.nixos.org/websvn/nix/?rev=26009&sc=1
Log:
* Give the installation VM a different MAC/IP from the fake nixos.org
VM. MAC collisions don't work at all with VDE.
Modified:
nixos/trunk/tests/installer.nix
Modified: nixos/trunk/tests/installer.nix
==============================================================================
--- nixos/trunk/tests/installer.nix Thu Feb 17 11:51:29 2011 (r26008)
+++ nixos/trunk/tests/installer.nix Thu Feb 17 13:00:55 2011 (r26009)
@@ -94,7 +94,7 @@
createDisk("harddisk", 4 * 1024);
my $machine = createMachine({ hda => "harddisk", cdrom =>
glob("${iso}/iso/*.iso"),
- qemuFlags => '${if testChannel then qemuNICFlags 1 1 1 else ""}'});
+ qemuFlags => '${if testChannel then qemuNICFlags 1 1 2 else ""}'});
$machine->start;
${optionalString testChannel ''
@@ -305,7 +305,7 @@
testScript =
''
# damn, it's costly to evaluate nixos-rebuild (1G of ram)
- my $machine = createMachine({ cdrom => glob("${iso}/iso/*.iso"),
qemuFlags => '${qemuNICFlags 1 1 1} -m 1024' });
+ my $machine = createMachine({ cdrom => glob("${iso}/iso/*.iso"),
qemuFlags => '${qemuNICFlags 1 1 2} -m 1024' });
$machine->start;
# Make sure that we don't try to download anything.
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
