[debbugs-tracker] bug#37039: closed ([PATCH] machine: Use 'become-command'.)

[GNU bug Tracking System]

Your message dated Fri, 16 Aug 2019 08:47:45 -0400
with message-id <address@hidden>
and subject line Re: [bug#37039] [PATCH] machine: Use 'become-command'.
has caused the debbugs.gnu.org bug report #37039,
regarding [PATCH] machine: Use 'become-command'.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden.)


-- 
37039: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=37039
GNU Bug Tracking System
Contact address@hidden with problems

--- Begin Message --- Subject: [PATCH] machine: Use 'become-command'. Date: Thu, 15 Aug 2019 12:09:11 -0400 User-agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux)

* 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
-- 
2.22.0

signature.asc
Description: PGP signature

--- End Message ---

> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#37039] [PATCH] machine: Use 'become-command'.
>
>
>
>
> Date: 
>
> Fri, 16 Aug 2019 08:47:45 -0400
>
>
>
>
> User-agent: 
>
> mu4e 1.2.0; emacs 26.2
>
>
>
>
> 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
>
>
>
> --- End Message ---