diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-19 08:58:56 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-19 08:58:56 +0000 |
| commit | c430bf5cc304945f152be81efd0a59ef28353388 (patch) | |
| tree | 949133457f5a1f24e5810db54bcbea31eef94f2e /lib | |
| parent | 6c55079ab05ea53a4cfa35e6c2390b461ec51cd7 (diff) | |
| download | nixlib-c430bf5cc304945f152be81efd0a59ef28353388.tar nixlib-c430bf5cc304945f152be81efd0a59ef28353388.tar.gz nixlib-c430bf5cc304945f152be81efd0a59ef28353388.tar.bz2 nixlib-c430bf5cc304945f152be81efd0a59ef28353388.tar.lz nixlib-c430bf5cc304945f152be81efd0a59ef28353388.tar.xz nixlib-c430bf5cc304945f152be81efd0a59ef28353388.tar.zst nixlib-c430bf5cc304945f152be81efd0a59ef28353388.zip | |
* Add virtio_console to the CD because the backdoor requires it.
* The booted CD no longer requires "-net user". svn path=/nixos/trunk/; revision=26427
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test-driver/Machine.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm index 4f8dcf441a86..919ab7c0764c 100644 --- a/lib/test-driver/Machine.pm +++ b/lib/test-driver/Machine.pm @@ -28,7 +28,7 @@ sub new { # !!! merge with qemu-vm.nix. $startCommand = "qemu-system-x86_64 -m 384 " . - "-net nic,model=virtio -net user,\$QEMU_NET_OPTS \$QEMU_OPTS "; + "-net nic,model=virtio \$QEMU_OPTS "; $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=virtio,boot=on,werror=report " if defined $args->{hda}; $startCommand .= "-cdrom $args->{cdrom} " |