From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:48987) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvLMK-0001G2-1B for guix-patches@gnu.org; Wed, 07 Aug 2019 08:48:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvLMI-0005Yx-K1 for guix-patches@gnu.org; Wed, 07 Aug 2019 08:48:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57582) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hvLMI-0005YT-Gi for guix-patches@gnu.org; Wed, 07 Aug 2019 08:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hvLMI-0000Pm-CE for guix-patches@gnu.org; Wed, 07 Aug 2019 08:48:02 -0400 Subject: [bug#36955] [PATCH] machine: Add 'build-locally?' field for managed hosts. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:48782) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvLLo-00013i-Nv for guix-patches@gnu.org; Wed, 07 Aug 2019 08:47:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvLLn-0005H4-NH for guix-patches@gnu.org; Wed, 07 Aug 2019 08:47:32 -0400 Received: from mx.sdf.org ([205.166.94.20]:65067) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hvLLn-0005Fa-Dj for guix-patches@gnu.org; Wed, 07 Aug 2019 08:47:31 -0400 Received: from Epsilon (pool-173-76-53-40.bstnma.fios.verizon.net [173.76.53.40]) (authenticated (0 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id x77ClTWp020212 (using TLSv1.2 with cipher AES256-GCM-SHA384 (256 bits) verified NO) for ; Wed, 7 Aug 2019 12:47:30 GMT From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) Date: Wed, 07 Aug 2019 08:44:18 -0400 Message-ID: <87imr9402l.fsf@sdf.lonestar.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36955@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * gnu/machine/ssh.scm (machine-ssh-configuration-build-locally?): New variable. (managed-host-remote-eval): Pass 'build-locally?' to 'remote-eval'. =2D-- gnu/machine/ssh.scm | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index ae312597dd..1f16d9a5ea 100644 =2D-- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -47,6 +47,7 @@ machine-ssh-configuration =20 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 =2D (host-name machine-ssh-configuration-host-name) ; string =2D (port machine-ssh-configuration-port ; integer =2D (default 22)) =2D (user machine-ssh-configuration-user ; string =2D (default "root")) =2D (identity machine-ssh-configuration-identity ; path to a private key =2D (default #f)) =2D (session machine-ssh-configuration-session ; session =2D (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))) =20 (define (machine-ssh-session machine) "Return the SSH session that was given in MACHINE's configuration, or cr= eate @@ -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) =2D (remote-eval exp (machine-ssh-session machine))) + (remote-eval exp (machine-ssh-session machine) + #:build-locally? + (machine-ssh-configuration-build-locally? + (machine-configuration machine)))) =20 ;;; =2D-=20 2.22.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----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----- --=-=-=--