Author: eelco
Date: Mon Jul 12 16:09:02 2010
New Revision: 22565
URL: https://svn.nixos.org/websvn/nix/?rev=22565&sc=1
Log:
* Don't do the "poweroff -f" fallback because that prevents
interactive testing ("nix-build tests/ -A nfs.vms;
./result/bin/run-vms").
Modified:
nixos/trunk/modules/testing/test-instrumentation.nix
Modified: nixos/trunk/modules/testing/test-instrumentation.nix
==============================================================================
--- nixos/trunk/modules/testing/test-instrumentation.nix Mon Jul 12
16:07:26 2010 (r22564)
+++ nixos/trunk/modules/testing/test-instrumentation.nix Mon Jul 12
16:09:02 2010 (r22565)
@@ -36,7 +36,7 @@
source /etc/profile
cd /tmp
echo "connecting to host..." > /dev/ttyS0
- ${pkgs.socat}/bin/socat tcp:10.0.2.6:23 exec:${rootShell} 2>
/dev/ttyS0 || poweroff -f
+ ${pkgs.socat}/bin/socat tcp:10.0.2.6:23 exec:${rootShell} 2>
/dev/ttyS0 # || poweroff -f
'';
respawn = false;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
