From 6bd32f0a27df5e9d7c349cc0955c5bec03a77e1a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Jun 2012 15:37:22 -0400
Subject: [PATCH] Drop the socat wrapper

---
 modules/testing/test-instrumentation.nix | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 5e40cf215b7..830f1744fa0 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -5,20 +5,6 @@
 
 with pkgs.lib;
 
-let
-
-  # Urgh, `socat' sets the SIGCHLD to ignore.  This wreaks havoc with
-  # some programs.
-  rootShell = pkgs.writeScript "shell.pl"
-    ''
-      #! ${pkgs.perl}/bin/perl
-      $SIG{CHLD} = 'DEFAULT';
-      print "\n";
-      exec "/bin/sh";
-    '';
-
-in
-
 {
 
   config =
@@ -41,7 +27,8 @@ in
             exec < /dev/hvc0 > /dev/hvc0 2> /dev/ttyS0
             echo "connecting to host..." >&2
             stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion
-            ${pkgs.socat}/bin/socat stdio exec:${rootShell}
+            echo
+            PS1= /bin/sh
           '';
 
         respawn = false;