Author: eelco
Date: Tue Feb 22 10:41:11 2011
New Revision: 26055
URL: https://svn.nixos.org/websvn/nix/?rev=26055&sc=1
Log:
* The vde_switch startup code was reading from the wrong filehandle,
so the startup synchronisation didn't work, causing spurious QEMU
failures ("Device 'vde' could not be initialized").
Modified:
nixos/trunk/lib/test-driver/test-driver.pl
Modified: nixos/trunk/lib/test-driver/test-driver.pl
==============================================================================
--- nixos/trunk/lib/test-driver/test-driver.pl Tue Feb 22 10:00:18 2011
(r26054)
+++ nixos/trunk/lib/test-driver/test-driver.pl Tue Feb 22 10:41:11 2011
(r26055)
@@ -38,9 +38,10 @@
}
close $stdoutW;
print $pty "version\n";
- readline $pty or die "cannot start vde_switch";
+ readline $stdoutR or die "cannot start vde_switch";
$ENV{"QEMU_VDE_SOCKET_$vlan"} = $socket;
$vlans{$vlan} = $pty;
+ die unless -e "$socket/ctl";
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
