Author: sandervanderburg
Date: Sun Dec 19 14:47:25 2010
New Revision: 25198
URL: https://svn.nixos.org/websvn/nix/?rev=25198&sc=1
Log:
Also wait until the Disnix daemon is running on all machines
Modified:
disnix/disnixos/trunk/data/testing.nix.in
Modified: disnix/disnixos/trunk/data/testing.nix.in
==============================================================================
--- disnix/disnixos/trunk/data/testing.nix.in Sun Dec 19 14:34:06 2010
(r25197)
+++ disnix/disnixos/trunk/data/testing.nix.in Sun Dec 19 14:47:25 2010
(r25198)
@@ -102,6 +102,7 @@
''
my $pid = ${"\$"}${targetName}->mustSucceed("${socat}/bin/socat
tcp-listen:512,fork exec:/bin/sh & echo -n \$!");
${"\$"}${targetName}->mustSucceed("while [ \"\$(ps -p $pid | grep
socat)\" = \"\" ]; do sleep 0.5; done");
+ ${"\$"}${targetName}->waitForJob("disnix");
'') (builtins.attrNames infrastructure)}
${"\$"}${builtins.head (builtins.attrNames
infrastructure)}->mustSucceed("${disnix}/bin/disnix-activate --interface
${disnixos}/bin/disnix-backdoor-client --target-property backdoor
--infrastructure ${manifest}/infrastructure.nix --no-coordinator-profile
${manifest}/manifest.xml");
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
