From b2e0293f022123b11759dfd498d4eff72233d3f7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 12 Jul 2014 00:43:28 +0200
Subject: [PATCH] build-remote.pl: Don't keep a shell process around

---
 perl/lib/Nix/SSH.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/perl/lib/Nix/SSH.pm b/perl/lib/Nix/SSH.pm
index 84bff5c785..3bcbabe981 100644
--- a/perl/lib/Nix/SSH.pm
+++ b/perl/lib/Nix/SSH.pm
@@ -113,7 +113,8 @@ sub connectToRemoteNix {
 
     # Start ‘nix-store --serve’ on the remote host.
     my ($from, $to);
-    my $pid = open2($from, $to, "ssh $sshHost @{$sshOpts} nix-store --serve --write $extraFlags");
+    # FIXME: don't start a shell, start ssh directly.
+    my $pid = open2($from, $to, "exec ssh $sshHost @{$sshOpts} nix-store --serve --write $extraFlags");
 
     # Do the handshake.
     my $SERVE_MAGIC_1 = 0x390c9deb; # FIXME