From 10119c9abcbd4cc3cd96285df9c5ce07691049b9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Feb 2011 13:00:55 +0000
Subject: [PATCH] * Give the installation VM a different MAC/IP from the fake
 nixos.org   VM.  MAC collisions don't work at all with VDE.

svn path=/nixos/trunk/; revision=26009
---
 tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index b356eff4947..817b8b7488e 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -94,7 +94,7 @@ let
       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 @@ in {
       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.