* Added a function waitForX, which returns when the X server accepts

connections.
* In the root shell, source /etc/bashrc and set $HOME and $DISPLAY.  

svn path=/nixos/trunk/; revision=19247

modules/testing/test-instrumentation.nix

@@ -18,7 +18,15 @@ with pkgs.lib;
             echo "===UP===" > dev/ttyS0
           '';
           
-        exec = "${pkgs.socat}/bin/socat tcp-listen:514,fork exec:/bin/sh 2> /dev/ttyS0";
+        script =
+          ''
+            export HOME=/root
+            export DISPLAY=:0.0
+            export GCOV_PREFIX=/tmp/coverage-data
+            source /etc/bashrc
+            cd /tmp
+            exec ${pkgs.socat}/bin/socat tcp-listen:514,fork exec:/bin/sh 2> /dev/ttyS0
+          '';
       };
   
     boot.postBootCommands =