From 17ef2346723b96080cc912da646df4f6424e83fa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jul 2014 16:24:57 +0200
Subject: Fix NIX_SSHOPTS

Closes #302.
---
 perl/lib/Nix/SSH.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'perl/lib/Nix/SSH.pm')

diff --git a/perl/lib/Nix/SSH.pm b/perl/lib/Nix/SSH.pm
index 76a20997590b..9e0c10beb0e0 100644
--- a/perl/lib/Nix/SSH.pm
+++ b/perl/lib/Nix/SSH.pm
@@ -6,12 +6,16 @@ use IPC::Open2;
 
 our @ISA = qw(Exporter);
 our @EXPORT = qw(
+  @globalSshOpts
   readN readInt readString readStrings
   writeInt writeString writeStrings
   connectToRemoteNix
 );
 
 
+our @globalSshOpts = split ' ', ($ENV{"NIX_SSHOPTS"} or "");
+
+
 sub readN {
     my ($bytes, $from) = @_;
     my $res = "";
@@ -82,7 +86,7 @@ sub connectToRemoteNix {
     # Start ‘nix-store --serve’ on the remote host.
     my ($from, $to);
     # FIXME: don't start a shell, start ssh directly.
-    my $pid = open2($from, $to, "exec ssh -x -a $sshHost @{$sshOpts} nix-store --serve --write $extraFlags");
+    my $pid = open2($from, $to, "exec ssh -x -a $sshHost @globalSshOpts @{$sshOpts} nix-store --serve --write $extraFlags");
 
     # Do the handshake.
     my $SERVE_MAGIC_1 = 0x390c9deb; # FIXME
-- 
cgit 1.4.1