diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-28 09:41:07 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-28 09:41:07 +0000 |
| commit | 2dc81fc9dd3b3f3b8005a10f8c76a8015560492f (patch) | |
| tree | efd0cf4645a27afc29d90b3f3317f921a4cd67b5 /lib | |
| parent | 66ffeb3fd9063938eb7f213810984cf6afe9063a (diff) | |
| download | nixlib-2dc81fc9dd3b3f3b8005a10f8c76a8015560492f.tar nixlib-2dc81fc9dd3b3f3b8005a10f8c76a8015560492f.tar.gz nixlib-2dc81fc9dd3b3f3b8005a10f8c76a8015560492f.tar.bz2 nixlib-2dc81fc9dd3b3f3b8005a10f8c76a8015560492f.tar.lz nixlib-2dc81fc9dd3b3f3b8005a10f8c76a8015560492f.tar.xz nixlib-2dc81fc9dd3b3f3b8005a10f8c76a8015560492f.tar.zst nixlib-2dc81fc9dd3b3f3b8005a10f8c76a8015560492f.zip | |
* Shut up warnings about QEMU_OPTS being undefined.
svn path=/nixos/trunk/; revision=27982
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 68b374c86aa7..2c6646eee336 100644 --- a/lib/test-driver/Machine.pm +++ b/lib/test-driver/Machine.pm @@ -126,7 +126,7 @@ sub start { $ENV{QEMU_OPTS} = "-no-reboot -monitor unix:./monitor -chardev socket,id=shell,path=./shell " . "-device virtio-serial -device virtconsole,chardev=shell " . - ($showGraphics ? "-serial stdio" : "-nographic"); + ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || ""); $ENV{QEMU_KERNEL_PARAMS} = "hostTmpDir=$ENV{TMPDIR}"; chdir $self->{stateDir} or die; exec $self->{startCommand}; |