From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:55271) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxz8q-0002Z3-29 for guix-patches@gnu.org; Wed, 14 Aug 2019 15:41:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxz8o-00053H-PZ for guix-patches@gnu.org; Wed, 14 Aug 2019 15:41:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40881) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hxz8o-000536-MG for guix-patches@gnu.org; Wed, 14 Aug 2019 15:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hxz8o-0006NC-HA for guix-patches@gnu.org; Wed, 14 Aug 2019 15:41:02 -0400 Subject: [bug#36872] [PATCH v2 2/2] remote: Remove '--system' argument. Resent-Message-ID: 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> <87y302mc0d.fsf_-_@sdf.lonestar.org> From: Christopher Lemmer Webber In-reply-to: <87y302mc0d.fsf_-_@sdf.lonestar.org> Date: Wed, 14 Aug 2019 15:40:37 -0400 Message-ID: <87sgq3y1qi.fsf@dustycloud.org> MIME-Version: 1.0 Content-Type: text/plain 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: "Jakob L. Kreuze" Cc: 36872@debbugs.gnu.org Looks good. Merged & pushed! Jakob L. Kreuze writes: > * 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'. > --- > 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 > --- 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 > - (map (cut scheme-file "activate-service" <>) gexps)) > - > - (scheme-file "activate" > - (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. If 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 this > - ;; 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))))) > + (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. If 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 this > + ;; 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))))) > > (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 > --- 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")) > - (display (G_ " > - -s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\"")) > (show-build-options-help) > (newline) > (display (G_ " > @@ -66,8 +64,7 @@ Perform the deployment specified by FILE.\n")) > %standard-build-options)) > > (define %default-options > - `((system . ,(%current-system)) > - (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 machine)) > - (parameterize ((%current-system (assq-ref opts 'system)) > - (%graft? (assq-ref opts 'graft?))) > + (parameterize ((%graft? (assq-ref opts 'graft?))) > (run-with-store store (deploy-machine machine)))) > machines))))