From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:48105) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hw9bU-0006Bu-45 for guix-patches@gnu.org; Fri, 09 Aug 2019 14:27:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hw9bS-00083R-QE for guix-patches@gnu.org; Fri, 09 Aug 2019 14:27:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34444) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hw9bS-00083K-MS for guix-patches@gnu.org; Fri, 09 Aug 2019 14:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hw9bS-0008OT-HO for guix-patches@gnu.org; Fri, 09 Aug 2019 14:27:02 -0400 Subject: [bug#36872] [PATCH v2 2/2] remote: Remove '--system' argument. Resent-Message-ID: From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) References: <87lfwee2yd.fsf@sdf.lonestar.org> <87h872e2v2.fsf@sdf.lonestar.org> <87ef1yovur.fsf@dustycloud.org> <877e7qvv75.fsf@sdf.lonestar.org> <87a7ckq129.fsf@dustycloud.org> <87sgqclnz0.fsf@sdf.lonestar.org> <8736ianqme.fsf_-_@sdf.lonestar.org> Date: Fri, 09 Aug 2019 14:25:54 -0400 In-Reply-To: <8736ianqme.fsf_-_@sdf.lonestar.org> (Jakob L. Kreuze's message of "Fri, 09 Aug 2019 14:24:57 -0400") Message-ID: <87y302mc0d.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: "Thompson, David" Cc: 36872@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * gnu/services.scm (activation-script): Return a rather than a . * gnu/deploy.scm (guix-deploy): Remove handling for '--system'. (show-help): Remove documentation for '--system'. (%default-options): Remove default setting for 'system'. =2D-- gnu/services.scm | 56 ++++++++++++++++++++--------------------- guix/scripts/deploy.scm | 8 ++---- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index 7de78105ff..6ee05d4580 100644 =2D-- a/gnu/services.scm +++ b/gnu/services.scm @@ -430,34 +430,34 @@ ACTIVATION-SCRIPT-TYPE." (define (activation-script gexps) "Return the system's activation script, which evaluates GEXPS." (define actions =2D (map (cut scheme-file "activate-service" <>) gexps)) =2D =2D (scheme-file "activate" =2D (with-imported-modules (source-module-closure =2D '((gnu build activation) =2D (guix build utils))) =2D #~(begin =2D (use-modules (gnu build activation) =2D (guix build utils)) =2D =2D ;; Make sure the user accounting database exists. = If it =2D ;; does not exist, 'setutxent' does not create it a= nd =2D ;; thus there is no accounting at all. =2D (close-port (open-file "/var/run/utmpx" "a0")) =2D =2D ;; Same for 'wtmp', which is populated by mingetty = et =2D ;; al. =2D (mkdir-p "/var/log") =2D (close-port (open-file "/var/log/wtmp" "a0")) =2D =2D ;; Set up /run/current-system. Among other things = this =2D ;; sets up locales, which the activation snippets =2D ;; executed below may expect. =2D (activate-current-system) =2D =2D ;; Run the services' activation snippets. =2D ;; TODO: Use 'load-compiled'. =2D (for-each primitive-load '#$actions))))) + (map (cut program-file "activate-service.scm" <>) gexps)) + + (program-file "activate.scm" + (with-imported-modules (source-module-closure + '((gnu build activation) + (guix build utils))) + #~(begin + (use-modules (gnu build activation) + (guix build utils)) + + ;; Make sure the user accounting database exists. I= f it + ;; does not exist, 'setutxent' does not create it and + ;; thus there is no accounting at all. + (close-port (open-file "/var/run/utmpx" "a0")) + + ;; Same for 'wtmp', which is populated by mingetty et + ;; al. + (mkdir-p "/var/log") + (close-port (open-file "/var/log/wtmp" "a0")) + + ;; Set up /run/current-system. Among other things t= his + ;; sets up locales, which the activation snippets + ;; executed below may expect. + (activate-current-system) + + ;; Run the services' activation snippets. + ;; TODO: Use 'load-compiled'. + (for-each primitive-load '#$actions))))) =20 (define (gexps->activation-gexp gexps) "Return a gexp that runs the activation script containing GEXPS." diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index ebc99e52cc..81f2b33260 100644 =2D-- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -43,8 +43,6 @@ (define (show-help) (display (G_ "Usage: guix deploy [OPTION] FILE... Perform the deployment specified by FILE.\n")) =2D (display (G_ " =2D -s, --system=3DSYSTEM attempt to build for SYSTEM--e.g., \"i686-lin= ux\"")) (show-build-options-help) (newline) (display (G_ " @@ -66,8 +64,7 @@ Perform the deployment specified by FILE.\n")) %standard-build-options)) =20 (define %default-options =2D `((system . ,(%current-system)) =2D (substitutes? . #t) + `((substitutes? . #t) (build-hook? . #t) (graft? . #t) (debug . 0) @@ -92,7 +89,6 @@ Perform the deployment specified by FILE.\n")) (set-build-options-from-command-line store opts) (for-each (lambda (machine) (info (G_ "deploying to ~a...") (machine-display-name ma= chine)) =2D (parameterize ((%current-system (assq-ref opts 'system= )) =2D (%graft? (assq-ref opts 'graft?))) + (parameterize ((%graft? (assq-ref opts 'graft?))) (run-with-store store (deploy-machine machine)))) machines)))) =2D-=20 2.22.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEa1VJLOiXAjQ2BGSm9Qb9Fp2P2VoFAl1NurMACgkQ9Qb9Fp2P 2VqwcRAAqRKmTRpyD1pRRGyHhZD4XUB/vGJJ7n4GbE4/4HSOZEp5Hmynj8De9a5K 4fY1htECNrwhGiJ7Qn565IRZ6EsU0jr01QBRj2jq9zeGfbwESoS6Dk5+5+BnbnT8 rXa42OGCaLdDhth1e+o6y/kN6P0FSrDkyX0Q0dB8u/MSzRilDWyXeaC52ZPJ+ZkV JdQyscxYI+xN4ilz5jDm/dpROgTnZN96lyajfzDjhMLssjJ4ZLhooZY7jBIg/JQK Xs7CTtH+M6s9h1OQ0y7LbBKw4JEOyNqPi9AAG7dP1fj/1g+UJKUxzmIVRTsXsgrC ixHT/iU4tGRTe0ewaTvgzIEKykZfvajyLJmazgzBd0xfAtZv0irNV8C+JlQYeXMR yDOurpfsokz0sKZCFp6b3YtufdsxkZvLrE1zluPMFku7n2wNCJc9t/AHVgeo7VdG y+126dVYJ5VB4N9d9Hq2m69IXDAqZa59b8WG7UKuVptZvm23j4qesPus/W/dyY+D GoZj/T2f9QvTruXsK28D8e2jefXLLB+ZZE/Y4+1IZ2Rke3Wgi1VtrLWgsKT8T1Kj v4Xo09Wlv18rkD8CKtNPra8Ln9oajXoizsBI3bx0qghgQK9bV3oQm3XZDn4JAdNk AaNggFbkGytj7weiRBCl0UGOW6DW0SjjLdRg8VTws3+Y5dxwJrM= =UbYc -----END PGP SIGNATURE----- --=-=-=--