From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:59598) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hybeF-0002IB-FM for guix-patches@gnu.org; Fri, 16 Aug 2019 08:48:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hybeE-0001lk-1v for guix-patches@gnu.org; Fri, 16 Aug 2019 08:48:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44451) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hybeD-0001lc-VP for guix-patches@gnu.org; Fri, 16 Aug 2019 08:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hybeD-0000MM-Rj for guix-patches@gnu.org; Fri, 16 Aug 2019 08:48:01 -0400 Subject: [bug#37039] [PATCH] machine: Use 'become-command'. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:59580) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hybe0-0002DA-Tc for guix-patches@gnu.org; Fri, 16 Aug 2019 08:47:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hybdz-0001f1-Rt for guix-patches@gnu.org; Fri, 16 Aug 2019 08:47:48 -0400 Received: from dustycloud.org ([2600:3c02::f03c:91ff:feae:cb51]:43292) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hybdz-0001eU-No for guix-patches@gnu.org; Fri, 16 Aug 2019 08:47:47 -0400 References: <87o90qe7h4.fsf@sdf.lonestar.org> From: Christopher Lemmer Webber In-reply-to: <87o90qe7h4.fsf@sdf.lonestar.org> Date: Fri, 16 Aug 2019 08:47:45 -0400 Message-ID: <874l2hxoni.fsf@dustycloud.org> MIME-Version: 1.0 Content-Type: text/plain 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: 37039@debbugs.gnu.org Cc: 37039-done@debbugs.gnu.org Looks fine and simple. Merged and pushed. Jakob L. Kreuze writes: > * gnu/machine/ssh.scm (managed-host-remote-eval): Pass an appropriate > 'become-command' to 'remote-eval'. > * guix/ssh.scm (remote-authorize-signing-key): Add optional > 'become-command' argument. > All callers changed. > --- > gnu/machine/ssh.scm | 7 +++++-- > guix/ssh.scm | 5 +++-- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm > index ac3aa3e370..aafe0ccf41 100644 > --- a/gnu/machine/ssh.scm > +++ b/gnu/machine/ssh.scm > @@ -126,7 +126,9 @@ an environment type of 'managed-host." > #:build-locally? > (machine-ssh-configuration-build-locally? config) > #:system > - (machine-ssh-configuration-system config)))) > + (machine-ssh-configuration-system config) > + #:become-command > + (machine-become-command machine)))) > > > ;;; > @@ -377,7 +379,8 @@ have you run 'guix archive --generate-key?'") > (lambda (port) > (string->canonical-sexp > (get-string-all port)))) > - (machine-ssh-session machine))) > + (machine-ssh-session machine) > + (machine-become-command machine))) > (mlet %store-monad ((_ (check-deployment-sanity machine)) > (boot-parameters (machine-boot-parameters machine))) > (let* ((os (machine-operating-system machine)) > diff --git a/guix/ssh.scm b/guix/ssh.scm > index 24834c6f68..7bc499a2fe 100644 > --- a/guix/ssh.scm > +++ b/guix/ssh.scm > @@ -302,7 +302,7 @@ the machine on the other end of SESSION." > (inferior-remote-eval '(begin (use-modules (guix utils)) (%current-system)) > session)) > > -(define (remote-authorize-signing-key key session) > +(define* (remote-authorize-signing-key key session #:optional become-command) > "Send KEY, a canonical sexp containing a public key, over SESSION and add it > to the system ACL file if it has not yet been authorized." > (inferior-remote-eval > @@ -321,7 +321,8 @@ to the system ACL file if it has not yet been authorized." > (mkdir-p (dirname %acl-file)) > (with-atomic-file-output %acl-file > (cut write-acl acl <>))))) > - session)) > + session > + become-command)) > > (define* (send-files local files remote > #:key