Author: eelco
Date: Thu Jul 28 09:41:07 2011
New Revision: 27982
URL: https://svn.nixos.org/websvn/nix/?rev=27982&sc=1
Log:
* Shut up warnings about QEMU_OPTS being undefined.
Modified:
nixos/trunk/lib/test-driver/Machine.pm
Modified: nixos/trunk/lib/test-driver/Machine.pm
==============================================================================
--- nixos/trunk/lib/test-driver/Machine.pm Thu Jul 28 09:32:02 2011
(r27981)
+++ nixos/trunk/lib/test-driver/Machine.pm Thu Jul 28 09:41:07 2011
(r27982)
@@ -126,7 +126,7 @@
$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};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
