From 3e91192f079c2eac4bd15d564bb2fd4702506b36 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 16 Feb 2014 00:27:43 +0100 Subject: vm/windows: Wait for VDE switch to startup. This could possibly cause flapping whenever qemu is too fast in starting up. As we are running with the shell's -e flag, the socat check also ensures that the VDE switch is properly started and causes the whole build to fail, should it not start up within 20 seconds. Signed-off-by: aszlig --- pkgs/build-support/vm/windows/controller/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/build-support/vm') diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 49d6815a3dce..22451e0e3947 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -148,6 +148,8 @@ let QEMU_VDE_SOCKET="$(pwd)/vde.ctl" MONITOR_SOCKET="$(pwd)/monitor" ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" & + echo 'alive?' | ${socat}/bin/socat - \ + UNIX-CONNECT:$QEMU_VDE_SOCKET/ctl,retry=20 ''; vmExec = if installMode then '' -- cgit 1.4.1