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

* Give the installation VM a different MAC/IP from the fake nixos.org

Browse Source 
VM.  MAC collisions don't work at all with VDE.

svn path=/nixos/trunk/; revision=26009
This commit is contained in:
Eelco Dolstra 2011-02-17 13:00:55 +00:00
parent 559834437a
commit 10119c9abc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/installer.nix
View File

@ -94,7 +94,7 @@ let
createDisk("harddisk", 4 * 1024); createDisk("harddisk", 4 * 1024);
my $machine = createMachine({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"), 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; $machine->start;
${optionalString testChannel '' ${optionalString testChannel ''
@ -305,7 +305,7 @@ in {
testScript = testScript =
'' ''
# damn, it's costly to evaluate nixos-rebuild (1G of ram) # 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; $machine->start;
# Make sure that we don't try to download anything. # Make sure that we don't try to download anything.