From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:59120) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkvUA-0002yw-Kt for guix-patches@gnu.org; Tue, 09 Jul 2019 15:09:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkvU7-0003yx-SA for guix-patches@gnu.org; Tue, 09 Jul 2019 15:09:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53687) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkvU6-0003yA-HZ for guix-patches@gnu.org; Tue, 09 Jul 2019 15:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkvU6-00047F-AP for guix-patches@gnu.org; Tue, 09 Jul 2019 15:09:02 -0400 Subject: [bug#36555] [PATCH v2 1/3] guix system: Add 'reconfigure' module. Resent-Message-ID: From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) References: <87imsci9sj.fsf@sdf.lonestar.org> <87imsbtk3o.fsf@dustycloud.org> <875zobvxg7.fsf_-_@sdf.lonestar.org> Date: Tue, 09 Jul 2019 15:08:11 -0400 In-Reply-To: <875zobvxg7.fsf_-_@sdf.lonestar.org> (Jakob L. Kreuze's message of "Tue, 09 Jul 2019 15:07:20 -0400") Message-ID: <871ryzvxes.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: Christopher Lemmer Webber Cc: 36555@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable * guix/scripts/system/reconfigure.scm: New file. * Makefile.am (MODULES): Add it. * guix/scripts/system.scm (bootloader-installer-script): Export variable. * gnu/machine/ssh.scm (switch-to-system, upgrade-shepherd-services) (install-bootloader): Delete variable. * gnu/machine/ssh.scm (deploy-managed-host): Rewrite procedure. =2D-- Makefile.am | 1 + gnu/machine/ssh.scm | 229 +++++++--------------------- guix/scripts/system.scm | 1 + guix/scripts/system/reconfigure.scm | 170 +++++++++++++++++++++ 4 files changed, 228 insertions(+), 173 deletions(-) create mode 100644 guix/scripts/system/reconfigure.scm diff --git a/Makefile.am b/Makefile.am index dd7720e87..58a96d348 100644 =2D-- a/Makefile.am +++ b/Makefile.am @@ -245,6 +245,7 @@ MODULES =3D \ guix/scripts/describe.scm \ guix/scripts/system.scm \ guix/scripts/system/search.scm \ + guix/scripts/system/reconfigure.scm \ guix/scripts/lint.scm \ guix/scripts/challenge.scm \ guix/scripts/import/crate.scm \ diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index a7d1a967a..5bac966ad 100644 =2D-- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -30,10 +30,13 @@ #:use-module (guix monads) #:use-module (guix records) #:use-module (guix remote) + #:use-module (guix scripts system) + #:use-module (guix scripts system reconfigure) #:use-module (guix ssh) #:use-module (guix store) #:use-module (ice-9 match) #:use-module (srfi srfi-19) + #:use-module (srfi srfi-26) #:use-module (srfi srfi-35) #:export (managed-host-environment-type =20 @@ -105,118 +108,6 @@ an environment type of 'managed-host." ;;; System deployment. ;;; =20 =2D(define (switch-to-system machine) =2D "Monadic procedure creating a new generation on MACHINE and execute the =2Dactivation script for the new system configuration." =2D (define (remote-exp drv script) =2D (with-extensions (list guile-gcrypt) =2D (with-imported-modules (source-module-closure '((guix config) =2D (guix profiles) =2D (guix utils))) =2D #~(begin =2D (use-modules (guix config) =2D (guix profiles) =2D (guix utils)) =2D =2D (define %system-profile =2D (string-append %state-directory "/profiles/system")) =2D =2D (let* ((system #$drv) =2D (number (1+ (generation-number %system-profile))) =2D (generation (generation-file-name %system-profile num= ber))) =2D (switch-symlinks generation system) =2D (switch-symlinks %system-profile generation) =2D ;; The implementation of 'guix system reconfigure' saves t= he =2D ;; load path and environment here. This is unnecessary here =2D ;; because each invocation of 'remote-eval' runs in a dist= inct =2D ;; Guile REPL. =2D (setenv "GUIX_NEW_SYSTEM" system) =2D ;; The activation script may write to stdout, which confus= es =2D ;; 'remote-eval' when it attempts to read a result from the =2D ;; remote REPL. We work around this by forcing the output = to a =2D ;; string. =2D (with-output-to-string =2D (lambda () =2D (primitive-load #$script)))))))) =2D =2D (let* ((os (machine-system machine)) =2D (script (operating-system-activation-script os))) =2D (mlet* %store-monad ((drv (operating-system-derivation os))) =2D (machine-remote-eval machine (remote-exp drv script))))) =2D =2D;; XXX: Currently, this does NOT attempt to restart running services. Th= is is =2D;; also the case with 'guix system reconfigure'. =2D;; =2D;; See . =2D(define (upgrade-shepherd-services machine) =2D "Monadic procedure unloading and starting services on the remote as ne= eded =2Dto realize the MACHINE's system configuration." =2D (define target-services =2D ;; Monadic expression evaluating to a list of (name output-path) pai= rs for =2D ;; all of MACHINE's services. =2D (mapm %store-monad =2D (lambda (service) =2D (mlet %store-monad ((file ((compose lower-object =2D shepherd-service-file) =2D service))) =2D (return (list (shepherd-service-canonical-name service) =2D (derivation->output-path file))))) =2D (service-value =2D (fold-services (operating-system-services (machine-system mac= hine)) =2D #:target-type shepherd-root-service-type)))) =2D =2D (define (remote-exp target-services) =2D (with-imported-modules '((gnu services herd)) =2D #~(begin =2D (use-modules (gnu services herd) =2D (srfi srfi-1)) =2D =2D (define running =2D (filter live-service-running (current-services))) =2D =2D (define (essential? service) =2D ;; Return #t if SERVICE is essential and should not be unloa= ded =2D ;; under any circumstance. =2D (memq (first (live-service-provision service)) =2D '(root shepherd))) =2D =2D (define (obsolete? service) =2D ;; Return #t if SERVICE can be safely unloaded. =2D (and (not (essential? service)) =2D (every (lambda (requirements) =2D (not (memq (first (live-service-provision serv= ice)) =2D requirements))) =2D (map live-service-requirement running)))) =2D =2D (define to-unload =2D (filter obsolete? =2D (remove (lambda (service) =2D (memq (first (live-service-provision servi= ce)) =2D (map first '#$target-services))) =2D running))) =2D =2D (define to-start =2D (remove (lambda (service-pair) =2D (memq (first service-pair) =2D (map (compose first live-service-provision) =2D running))) =2D '#$target-services)) =2D =2D ;; Unload obsolete services. =2D (for-each (lambda (service) =2D (false-if-exception =2D (unload-service service))) =2D to-unload) =2D =2D ;; Load the service files for any new services and start them. =2D (load-services/safe (map second to-start)) =2D (for-each start-service (map first to-start)) =2D =2D #t))) =2D =2D (mlet %store-monad ((target-services target-services)) =2D (machine-remote-eval machine (remote-exp target-services)))) =2D (define (machine-boot-parameters machine) "Monadic procedure returning a list of 'boot-parameters' for the generat= ions of MACHINE's system profile, ordered from most recent to oldest." @@ -275,71 +166,63 @@ of MACHINE's system profile, ordered from most recent= to oldest." (boot-parameters-kernel-arguments params)))))))) generations)))) =20 =2D(define (install-bootloader machine) =2D "Create a bootloader entry for the new system generation on MACHINE, a= nd =2Dconfigure the bootloader to boot that generation by default." =2D (define bootloader-installer-script =2D (@@ (guix scripts system) bootloader-installer-script)) =2D =2D (define (remote-exp installer bootcfg bootcfg-file) =2D (with-extensions (list guile-gcrypt) =2D (with-imported-modules (source-module-closure '((gnu build install) =2D (guix store) =2D (guix utils))) =2D #~(begin =2D (use-modules (gnu build install) =2D (guix store) =2D (guix utils)) =2D (let* ((gc-root (string-append "/" %gc-roots-directory "/boo= tcfg")) =2D (temp-gc-root (string-append gc-root ".new"))) =2D =2D (switch-symlinks temp-gc-root gc-root) =2D =2D (unless (false-if-exception =2D (begin =2D ;; The implementation of 'guix system reconfigu= re' =2D ;; saves the load path here. This is unnecessar= y here =2D ;; because each invocation of 'remote-eval' run= s in a =2D ;; distinct Guile REPL. =2D (install-boot-config #$bootcfg #$bootcfg-file "= /") =2D ;; The installation script may write to stdout,= which =2D ;; confuses 'remote-eval' when it attempts to r= ead a =2D ;; result from the remote REPL. We work around = this =2D ;; by forcing the output to a string. =2D (with-output-to-string =2D (lambda () =2D (primitive-load #$installer))))) =2D (delete-file temp-gc-root) =2D (error "failed to install bootloader")) =2D =2D (rename-file temp-gc-root gc-root) =2D #t))))) =2D =2D (mlet* %store-monad ((boot-parameters (machine-boot-parameters machine= ))) =2D (let* ((os (machine-system machine)) =2D (bootloader ((compose bootloader-configuration-bootloader =2D operating-system-bootloader) =2D os)) =2D (bootloader-target (bootloader-configuration-target =2D (operating-system-bootloader os))) =2D (installer (bootloader-installer-script =2D (bootloader-installer bootloader) =2D (bootloader-package bootloader) =2D bootloader-target =2D "/")) =2D (menu-entries (map boot-parameters->menu-entry boot-parameter= s)) =2D (bootcfg (operating-system-bootcfg os menu-entries)) =2D (bootcfg-file (bootloader-configuration-file bootloader))) =2D (machine-remote-eval machine (remote-exp installer bootcfg bootcfg= -file))))) =2D (define (deploy-managed-host machine) "Internal implementation of 'deploy-machine' for MACHINE instances with = an environment type of 'managed-host." + (define target-services + (service-value + (fold-services (operating-system-services (machine-system machine)) + #:target-type shepherd-root-service-type))) + + (define (serialize-service service) + "Monadic procedure serializing SERVICE, a ." + (mlet %store-monad ((file (lower-object (shepherd-service-file service= )))) + (return (list (shepherd-service-canonical-name service) + (derivation->output-path file))))) + + (define (run-switch-to-system machine) + "Monadic procedure serializing the items in MACHINE necessary to build= a +G-Expression with 'switch-to-system'." + (mlet %store-monad ((script (switch-system-program (machine-system mac= hine)))) + (machine-remote-eval machine #~(primitive-load #$script)))) + + (define (run-upgrade-shepherd-services machine) + "Monadic procedure serializing the items in MACHINE necessary to build= a +G-Expression with 'upgrade-shepherd-services'." + (mlet* %store-monad ((services (mapm %store-monad serialize-service + target-services)) + (script (upgrade-services-program services))) + (machine-remote-eval machine #~(primitive-load #$script)))) + + (define (run-install-bootloader machine) + "Monadic procedure serializing the items in MACHINE necessary to build= a +G-Expression with 'install-bootloader'." + (mlet %store-monad ((boot-parameters (machine-boot-parameters machine)= )) + (let* ((os (machine-system machine)) + (bootloader ((compose bootloader-configuration-bootloader + operating-system-bootloader) + os)) + (target (bootloader-configuration-target + (operating-system-bootloader os))) + (installer (bootloader-installer-script + (bootloader-installer bootloader) + (bootloader-package bootloader) + target + "/")) + (menu-entries (map boot-parameters->menu-entry boot-parameter= s)) + (bootcfg (operating-system-bootcfg os menu-entries)) + (bootcfg-file (bootloader-configuration-file bootloader))) + (mlet %store-monad ((script (install-bootloader-program installer + bootcfg + bootcfg-fi= le + "/"))) + (machine-remote-eval machine #~(primitive-load #$script)))))) + (maybe-raise-unsupported-configuration-error machine) =2D (mbegin %store-monad =2D (switch-to-system machine) =2D (upgrade-shepherd-services machine) =2D (install-bootloader machine))) + (mapm %store-monad (cut <> machine) + (list run-switch-to-system + run-upgrade-shepherd-services + run-install-bootloader))) =20 ;;; diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 60c1ca5c9..21858ee7d 100644 =2D-- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -70,6 +70,7 @@ #:use-module (ice-9 match) #:use-module (rnrs bytevectors) #:export (guix-system + bootloader-installer-script read-operating-system)) =20 diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reco= nfigure.scm new file mode 100644 index 000000000..9491bde34 =2D-- /dev/null +++ b/guix/scripts/system/reconfigure.scm @@ -0,0 +1,170 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Court=C3= =A8s +;;; Copyright =C2=A9 2016 Alex Kost +;;; Copyright =C2=A9 2016, 2017, 2018 Chris Marusich +;;; Copyright =C2=A9 2017 Mathieu Othacehe +;;; Copyright =C2=A9 2018 Ricardo Wurmus +;;; Copyright =C2=A9 2019 Christopher Baines +;;; Copyright =C2=A9 2019 Jakob L. Kreuze +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix scripts system reconfigure) + #:autoload (gnu packages gnupg) (guile-gcrypt) + #:use-module (gnu system) + #:use-module (guix gexp) + #:use-module (guix modules) + #:export (switch-system-program + upgrade-services-program + install-bootloader-program)) + +;;; Commentary: +;;; +;;; This module implements the "effectful" parts of system +;;; reconfiguration. Although building a system derivation is a pure +;;; operation, a number of impure operations must be carried out for the +;;; system configuration to be realized -- chiefly, creation of generation +;;; symlinks and invocation of activation scripts. +;;; +;;; Code: + +(define* (switch-system-program os #:optional profile) + "Return as a monadic value a derivation to build a scheme file that, upon +being evaluated, will create a new generation of PROFILE pointing to the +directory of OS, switch to it atomically, and run OS's activation script, +returning any textual output produced by the activation script as a string= ." + (gexp->script + "switch-to-system.scm" + (with-extensions (list guile-gcrypt) + (with-imported-modules (source-module-closure '((guix config) + (guix profiles) + (guix utils))) + #~(begin + (use-modules (guix config) + (guix profiles) + (guix utils)) + + (define profile + (or #$profile (string-append %state-directory "/profiles/syst= em"))) + + (let* ((number (1+ (generation-number profile))) + (generation (generation-file-name profile number))) + (switch-symlinks generation #$os) + (switch-symlinks profile generation) + (setenv "GUIX_NEW_SYSTEM" #$os) + (with-output-to-string + (lambda () + (primitive-load + #$(operating-system-activation-script os)))))))))) + +;; XXX: Currently, this does NOT attempt to restart running services. See +;; for details. +(define (upgrade-services-program target-services) + "Return as a monadic value a derivation to build a scheme file that, upon +being evaluated, will upgrade the Shepherd (PID 1) by unloading obsolete +services and loading new services. TARGET-SERVICES is a list +of (shepherd-service-canonical-name, shepherd-service-file) pairs used for +determining which services are obsolete, as well as which are new." + (gexp->script + "upgrade-shepherd-services.scm" + (with-imported-modules '((gnu services herd)) + #~(begin + (use-modules (gnu services herd) + (srfi srfi-1)) + + (define (call-with-shepherd-error-handling proc) + (lambda (service) + (catch 'system-error + (lambda () + (proc service) + #f) + (lambda (key proc format-string format-args errno . rest) + (apply format #f format-string format-args))))) + + (define running + (filter live-service-running (current-services))) + + (define (essential? service) + ;; Return #t if SERVICE is essential and should not be unloaded + ;; under any circumstance. + (memq (first (live-service-provision service)) + '(root shepherd))) + + (define (obsolete? service) + ;; Return #t if SERVICE can be safely unloaded. + (and (not (essential? service)) + (every (lambda (requirements) + (not (memq (first (live-service-provision service)) + requirements))) + (map live-service-requirement running)))) + + (define to-unload + (filter obsolete? + (remove (lambda (service) + (memq (first (live-service-provision service)) + (map first '#$target-services))) + running))) + + (define to-start + (remove (lambda (service-pair) + (memq (first service-pair) + (map (compose first live-service-provision) + running))) + '#$target-services)) + + ;; Load the service files for any new services. + (load-services/safe (map second to-start)) + + ;; Unload obsolete services and start new services. + (filter string? + (append (map (call-with-shepherd-error-handling unload-ser= vice) + to-unload) + (map (call-with-shepherd-error-handling start-serv= ice) + (map first to-start)))))))) + +(define (install-bootloader-program installer-script bootcfg bootcfg-file = target) + "Return as a monadic value a derivation to build a scheme file that, upon +being evaluated, will install BOOTCFG to BOOTCFG-FILE, a target file name,= on +TARGET, a mount point, and subsequently run INSTALLER-SCRIPT, returning any +textual output produced by the installer script as a string." + (gexp->script + "install-bootloader.scm" + (with-extensions (list guile-gcrypt) + (with-imported-modules (source-module-closure '((gnu build install) + (guix store) + (guix utils))) + #~(begin + (use-modules (gnu build install) + (guix store) + (guix utils)) + (let* ((gc-root (string-append #$target %gc-roots-directory "/b= ootcfg")) + (temp-gc-root (string-append gc-root ".new"))) + + (switch-symlinks temp-gc-root gc-root) + + (let ((installer-result + (false-if-exception + (begin + (install-boot-config #$bootcfg #$bootcfg-file #$tar= get) + (with-output-to-string + (lambda () + (when #$installer-script + (primitive-load #$installer-script)))))))) + (unless installer-result + (delete-file temp-gc-root) + (error "failed to install bootloader")) + (rename-file temp-gc-root gc-root) + installer-result))))))) =2D-=20 2.22.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEa1VJLOiXAjQ2BGSm9Qb9Fp2P2VoFAl0k5hwACgkQ9Qb9Fp2P 2VoclhAAlpMV2G3qhL4/IUEyMK0sqzTLwWplx5YzvAjOYIDf7aJ2tEWPkG4TJmZM A+04y7MqAcJMPQepxETenRCUi8QkLv7GxqIFZdU0YX4Dv8GNH+YfefqlkvLsvCQF Z5jTvYgqnkPZxuXXKrBUGgp0hdCphpf84uM/yJc28B17Y74byC4shZObmA9G0G89 5I14mkcK70blOmDDxA0egrdEuuxONTi8kdVPam4AxDim9ju/kojnyaguzLhl6sI4 6Z2agT0HmwE8RP7CgTIPPUL/jSFOf8MIvPRcvHOaVfznxYDQnZ3IdmVJKR7N+xz8 Ys0pCBmp0uZr+cUMczFaLSQeZbrF/OazE3QhdY3XBb7MpsoJqycUGiYkgfd/ALd/ +xDi/LTMlCuBENYnPJqSb5LZ0XXjnBFyoZYfE+4c9J2Q3yOTVObIQXKfyWOxFNw/ G8ti8g7SQW2rYV/B7o05biA5ZRSlLKRSFPdj3/5iJIis3ZkZBAj9mPwj8+LPkBG3 uRtiEndzodiBI2IRx0ju2JkeeRDiEVjk2fefTIE2clkD20hj7kGrVGz/D0JnoFEC V7UZ8cyBEzTZBtJ/F8sz5yfVgWhscJKf/AscYMjJ12EWh5/gJjcEvr9zK5HUy7uc LZokuhDhTc8AQWhgO8gjmcIggJTAELVkK23iIvXe3izD2vKDy9Q= =jONW -----END PGP SIGNATURE----- --=-=-=--