From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:55536) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsowc-00024C-2T for guix-patches@gnu.org; Wed, 31 Jul 2019 09:47:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsowZ-0006Sp-Ia for guix-patches@gnu.org; Wed, 31 Jul 2019 09:47:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42843) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hsowY-0006Rj-6v for guix-patches@gnu.org; Wed, 31 Jul 2019 09:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hsowY-0003zQ-4j for guix-patches@gnu.org; Wed, 31 Jul 2019 09:47:02 -0400 Subject: [bug#36872] [PATCH 2/2] remote: Remove '--system' argument. Resent-Message-ID: From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) References: <87lfwee2yd.fsf@sdf.lonestar.org> Date: Wed, 31 Jul 2019 09:43:29 -0400 In-Reply-To: <87lfwee2yd.fsf@sdf.lonestar.org> (Jakob L. Kreuze's message of "Wed, 31 Jul 2019 09:41:30 -0400") Message-ID: <87h872e2v2.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: 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 8eeb9ae7a1..bc1d93a93a 100644 =2D-- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -44,8 +44,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_ " @@ -67,8 +65,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) @@ -91,8 +88,7 @@ Perform the deployment specified by FILE.\n")) (for-each (lambda (machine) (info (G_ "deploying to ~a...~%") (machine-display-name machine)) =2D (parameterize ((%current-system (assq-ref opts 'system= )) =2D (%graft? (assq-ref opts 'graft?))) + (parameterize ((%graft? (assq-ref opts 'graft?))) (guard (c ((message-condition? c) (report-error (G_ "failed to deploy ~a: '~a= '~%") (machine-display-name machine) =2D-=20 2.22.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEa1VJLOiXAjQ2BGSm9Qb9Fp2P2VoFAl1BmwEACgkQ9Qb9Fp2P 2Vp5kw//en36fICfLjxE5bCOTR7KSDsGCzk7KsJJVi1v6v9KMhalBptAbIfD1irK GpO7GWc2+DjSPyNLCb6Syjrnq5x8xuDCJTeK1IdTMDMLogijSe0uZA43rOmXtx4L 877MQ9KB+wejy4dTTS8LyLN2AmjhQBfNzxmPgF/7BechE0X5A+E7YyaHiYDAOGZu /xmJRbK0KsFS3tCZ8HvHbT5Bx1dJYPN14oDenbNooC0wVZjHnxYf0hTJcWmdE7HK Z6YS0zgJ9QBmJnAZagqq7GXCm5QUz7PXN5hSpeIb52LNa3YhLMlJiNyYQGlJTcpw qQr3L0Z/JKbB/E9VRXncT4dsuaK5x3+7ak6Gm76JmGG9EPYjm+fQM8iDFOQEPT3e G1qAO/aSifAEg6gyr4ZCKw42wyObjB2IeVZ14wxDdknDMreiij7Aq2z/PfZtOzOq tsYseivavFPK433M8dhJnnZDkIOcZJLlArQvG6bu/W8RmwKfjg43/LBv9vzBhbxI /2wFZ3CxSWWo20YN+krINoqUnMJDIafKJwKiVKfO+kyD/WOOGBJcTrfw+6Z1VW2O qpZROkrfzZ5eW4CwBX+NH0V6WOF8l+ly+iVwpifBwvVKzccmLFmrRrrblt4+tShq F2qQq3BefVRuVXAgXf/MaoPHHIJob3Fp0Kjt8vDpx8GKBJFn1WY= =pNoE -----END PGP SIGNATURE----- --=-=-=--