(address . guix-patches@gnu.org)
* gnu/machine/ssh.scm (machine-ssh-configuration-build-locally?): New
variable.
(managed-host-remote-eval): Pass 'build-locally?' to 'remote-eval'.
---
gnu/machine/ssh.scm | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
Toggle diff (53 lines)
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
index ae312597dd..1f16d9a5ea 100644
--- a/gnu/machine/ssh.scm
+++ b/gnu/machine/ssh.scm
@@ -47,6 +47,7 @@
machine-ssh-configuration
machine-ssh-configuration-host-name
+ machine-ssh-configuration-build-locally?
machine-ssh-configuration-port
machine-ssh-configuration-user
machine-ssh-configuration-session))
@@ -69,15 +70,17 @@
make-machine-ssh-configuration
machine-ssh-configuration?
this-machine-ssh-configuration
- (host-name machine-ssh-configuration-host-name) ; string
- (port machine-ssh-configuration-port ; integer
- (default 22))
- (user machine-ssh-configuration-user ; string
- (default "root"))
- (identity machine-ssh-configuration-identity ; path to a private key
- (default #f))
- (session machine-ssh-configuration-session ; session
- (default #f)))
+ (host-name machine-ssh-configuration-host-name) ; string
+ (build-locally? machine-ssh-configuration-build-locally?
+ (default #t))
+ (port machine-ssh-configuration-port ; integer
+ (default 22))
+ (user machine-ssh-configuration-user ; string
+ (default "root"))
+ (identity machine-ssh-configuration-identity ; path to a private key
+ (default #f))
+ (session machine-ssh-configuration-session ; session
+ (default #f)))
(define (machine-ssh-session machine)
"Return the SSH session that was given in MACHINE's configuration, or create
@@ -103,7 +106,10 @@ one from the configuration's parameters if one was not provided."
"Internal implementation of 'machine-remote-eval' for MACHINE instances with
an environment type of 'managed-host."
(maybe-raise-unsupported-configuration-error machine)
- (remote-eval exp (machine-ssh-session machine)))
+ (remote-eval exp (machine-ssh-session machine)
+ #:build-locally?
+ (machine-ssh-configuration-build-locally?
+ (machine-configuration machine))))
;;;
--
2.22.0
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEa1VJLOiXAjQ2BGSm9Qb9Fp2P2VoFAl1Kx6IACgkQ9Qb9Fp2P
2VodWA/+Pn9CjudwlzQylW3A+ULRjej06E/2siVomfgT9gw6JVmfaN2JyUt9ORs3
SwNmDfTIkmp1pWuQeprgU6PCyYRh9FCHHuLKa41xoyl106UR+KJKBYBL1an8OyJ9
vODYyM3HwJjRJIvMnC9uV4+bqrWF9OfJ4C2H55jhgH5uyDReqsOS6eu0s8+mprQf
OulP/5E2v89SSNI2Duyl9iMxg23Eq+kVZrgxbx3xlHTo6bZv/iJlIbnm2n4S+kil
6dt0KcDYhmH0L4k0qezyG+loPfvAZVdfPNUOfNzSPhHMzkM/lR7eYqrLCxxiCw6M
xGcmmAm6Iu9JGcCLXK7SCf+VrkzvzlT9TTSp7c/k21rXRbVlcMv431ymXro9qBsf
M06gd0QFFHLNLak/hOCK+sYeP8iXHh2ofWXWARvw9L30ZAu8XmrfGFXXRZ/Jkb6B
1hQ563MWqlGEEOp8qe/p3G1H1e88M4A5oedHtvUvXgGzIvz0euWBRETBjITp6+l8
rTG13Izqw8ftan+4HS/qmrn4kWm+MVlHaXBzx6pKjb0xReNYjrAuljAe8EyPz2lc
qh5vVYvxdoA2KLV0XurF/IUlNeFxseZaWqk8Pf+ejYsrOJPr3tuyN3fVTOVIPG/l
X50/LwNH8nCs0sYZ+2JfeSFe5gRtLj9UN/U54SuTU0opu1teH9U=
=LaV8
-----END PGP SIGNATURE-----