From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 15 12:09:37 2019 Received: (at submit) by debbugs.gnu.org; 15 Aug 2019 16:09:37 +0000 Received: from localhost ([127.0.0.1]:52328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hyIJl-0002NN-7s for submit@debbugs.gnu.org; Thu, 15 Aug 2019 12:09:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:47199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hyIJj-0002NG-QP for submit@debbugs.gnu.org; Thu, 15 Aug 2019 12:09:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43559) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyIJe-0005md-8B for guix-patches@gnu.org; Thu, 15 Aug 2019 12:09:35 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyIJX-0007AU-Bm for guix-patches@gnu.org; Thu, 15 Aug 2019 12:09:27 -0400 Received: from mx.sdf.org ([205.166.94.20]:61839) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyIJX-00079K-3a for guix-patches@gnu.org; Thu, 15 Aug 2019 12:09:23 -0400 Received: from Upsilon (tor2.anonymizer.ccc.de [217.115.10.132]) (authenticated (0 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id x7FG9Bl6006321 (using TLSv1.2 with cipher AES256-GCM-SHA384 (256 bits) verified NO) for ; Thu, 15 Aug 2019 16:09:19 GMT From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) To: guix-patches@gnu.org Subject: [PATCH] machine: Use 'become-command'. Date: Thu, 15 Aug 2019 12:09:11 -0400 Message-ID: <87o90qe7h4.fsf@sdf.lonestar.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 205.166.94.20 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * 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. =2D-- 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 =2D-- 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 =2D (machine-ssh-configuration-system config)))) + (machine-ssh-configuration-system config) + #:become-command + (machine-become-command machine)))) =20 ;;; @@ -377,7 +379,8 @@ have you run 'guix archive --generate-key?'") (lambda (port) (string->canonical-sexp (get-string-all port)))) =2D (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 =2D-- 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-syste= m)) session)) =20 =2D(define (remote-authorize-signing-key key session) +(define* (remote-authorize-signing-key key session #:optional become-comma= nd) "Send KEY, a canonical sexp containing a public key, over SESSION and ad= d 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 authorize= d." (mkdir-p (dirname %acl-file)) (with-atomic-file-output %acl-file (cut write-acl acl <>))))) =2D session)) + session + become-command)) =20 (define* (send-files local files remote #:key =2D-=20 2.22.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEa1VJLOiXAjQ2BGSm9Qb9Fp2P2VoFAl1Vg6cACgkQ9Qb9Fp2P 2Voe2g//RWxOVT1M0mhS+gbGBWoepPPxuCp/E2UcakG5qzwoeibRHAv3GsC7e76x zAHCd4klo3cQcR8NUsR9yBpu0C+1P2aW8Tc1SLfSh6p87UJD7KFRK3ihN/G4aZ86 yAPwydcfBEfFK7AfR7ioMzHXYGlHNFJCxj+fv9zTfvGplvhY1sgh7BZRwvsHoVaA MrcaddatzZ+A4Y8pG5/MXrkphCtYVTfhx7wn0JZBi6xnW2Tna+FGx5DMDez9rEiS W23ZkuKRqyLAe1zrmF0CtFTqVjGdRTJ1AYIP43OC87zhZy9nVy3tA2rawcbp0lF3 1s/HfHxLlCn6skHWA9AvX4wZD9eD4yZxqdA5/TGe7scVj8Eh+DFXGexht2L9g3sz FRfJA3Ezn+OkI5JBxgMMslA9eCdjr6ppW9WIHDvIO8FrRcl1eiP6eCZoZ+VVi1rm oEZrygdihoBqx8e50Y3xyVHX1TluDqUkeP+tfqqX+CDMLhD+ZA5SWb0icKq9Xk5K i+HdBDOqOdya6HBlEwvX1cFgvnVk5m/SY1Sk07IFzeQZ6nKKMWxiu0CsHWx0aK+H toyv/EHXoZarnYCn82OQdOKeuhWWbwhDr9t+iXiWXOeonc8ACYIt2XbSr/x5aIXR KlxKWcNZpjkgZH12BcUzEjlIUq3sEP8lhztLKb5szmj7D5yCT/0= =u5rr -----END PGP SIGNATURE----- --=-=-=--