From cecd72d55ae974f8ebe900e0088071f843866935 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 13 Mar 2014 21:58:04 +0100 Subject: offload: Allow build machines to specify a port number. * guix/scripts/offload.scm (): Add 'port' field. (remote-pipe, send-files): Use lsh's '-p' option when invoking it. --- guix/scripts/offload.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'guix/scripts/offload.scm') diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm index 4d2f78f711..4a105e946f 100644 --- a/guix/scripts/offload.scm +++ b/guix/scripts/offload.scm @@ -56,6 +56,8 @@ (define-record-type* build-machine make-build-machine build-machine? (name build-machine-name) ; string + (port build-machine-port ; number + (default 22)) (system build-machine-system) ; string (user build-machine-user) ; string (private-key build-machine-private-key ; file name @@ -161,8 +163,9 @@ (define (remote-pipe machine mode command) "Run COMMAND on MACHINE, assuming an lsh gateway has been set up." (catch 'system-error (lambda () - (apply open-pipe* mode %lshg-command - "-l" (build-machine-user machine) "-z" + (apply open-pipe* mode %lshg-command "-z" + "-l" (build-machine-user machine) + "-p" (build-machine-port machine) ;; XXX: Remove '-i' when %LSHG-COMMAND really is lshg. "-i" (build-machine-private-key machine) @@ -328,6 +331,7 @@ (define (missing-files files) (missing (filtered-port (list (which %lshg-command) "-l" (build-machine-user machine) + "-p" (build-machine-port machine) "-i" (build-machine-private-key machine) (build-machine-name machine) "guix" "archive" "--missing") -- cgit v1.2.3