Author: sandervanderburg
Date: Sun Dec 19 14:34:06 2010
New Revision: 25197
URL: https://svn.nixos.org/websvn/nix/?rev=25197&sc=1
Log:
An attempt to fix some timing issues
Modified:
disnix/disnixos/trunk/data/infrastructure.nix.in
disnix/disnixos/trunk/data/testing.nix.in
Modified: disnix/disnixos/trunk/data/infrastructure.nix.in
==============================================================================
--- disnix/disnixos/trunk/data/infrastructure.nix.in Sat Dec 18 23:42:41
2010 (r25196)
+++ disnix/disnixos/trunk/data/infrastructure.nix.in Sun Dec 19 14:34:06
2010 (r25197)
@@ -14,11 +14,14 @@
modules = [
configuration
- { key = "publish-infrastructure";
+ ]
+ ++ [
+ { key = "publish-infrastructure";
services.disnix.publishInfrastructure.enable = true;
services.disnix.publishInfrastructure.enableAuthentication = true;
}
- ] ++ pkgs.lib.optional useBackdoor {
+ ]
+ ++ pkgs.lib.optional useBackdoor {
key = "backdoor";
networking.hostName = targetName;
services.disnix.infrastructure.backdoor = if useTcpSocket then
"TCP:${targetName}:512" else "UNIX-CONNECT:${targetName}.socket";
Modified: disnix/disnixos/trunk/data/testing.nix.in
==============================================================================
--- disnix/disnixos/trunk/data/testing.nix.in Sat Dec 18 23:42:41 2010
(r25196)
+++ disnix/disnixos/trunk/data/testing.nix.in Sun Dec 19 14:34:06 2010
(r25197)
@@ -100,7 +100,8 @@
${lib.concatMapStrings (targetName:
''
- ${"\$"}${targetName}->mustSucceed("${socat}/bin/socat
tcp-listen:512,fork exec:/bin/sh &");
+ 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");
'') (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
