From: Christopher Lemmer Webber <cwebber@dustycloud.org>
To: 37039@debbugs.gnu.org
Cc: 37039-done@debbugs.gnu.org
Subject: [bug#37039] [PATCH] machine: Use 'become-command'.
Date: Fri, 16 Aug 2019 08:47:45 -0400 [thread overview]
Message-ID: <874l2hxoni.fsf@dustycloud.org> (raw)
In-Reply-To: <87o90qe7h4.fsf@sdf.lonestar.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))))
>
> \f
> ;;;
> @@ -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
prev parent reply other threads:[~2019-08-16 12:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-15 16:09 [bug#37039] [PATCH] machine: Use 'become-command' Jakob L. Kreuze
2019-08-16 12:47 ` Christopher Lemmer Webber [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874l2hxoni.fsf@dustycloud.org \
--to=cwebber@dustycloud.org \
--cc=37039-done@debbugs.gnu.org \
--cc=37039@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).