From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:37589) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnXBw-0005oq-QF for guix-patches@gnu.org; Tue, 16 Jul 2019 19:49:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnXBu-0007Dg-Kg for guix-patches@gnu.org; Tue, 16 Jul 2019 19:49:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42527) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnXBu-0007DZ-HE for guix-patches@gnu.org; Tue, 16 Jul 2019 19:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hnXBu-00045P-Di for guix-patches@gnu.org; Tue, 16 Jul 2019 19:49:02 -0400 Subject: [bug#36555] [PATCH v3 2/3] guix system: Reimplement 'reconfigure'. Resent-Message-ID: From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) References: <87imsci9sj.fsf@sdf.lonestar.org> <87ef30i9fl.fsf@sdf.lonestar.org> <87y3129qsn.fsf@gnu.org> <87sgr9bziq.fsf@sdf.lonestar.org> <87pnmc7nt1.fsf@gnu.org> <8736j7nwcb.fsf@sdf.lonestar.org> <87muhfjm14.fsf@gnu.org> <87ftn63l7d.fsf@sdf.lonestar.org> <87v9w1zgon.fsf_-_@sdf.lonestar.org> <87r26pzgmx.fsf_-_@sdf.lonestar.org> Date: Tue, 16 Jul 2019 19:48:09 -0400 In-Reply-To: <87r26pzgmx.fsf_-_@sdf.lonestar.org> (Jakob L. Kreuze's message of "Tue, 16 Jul 2019 19:47:18 -0400") Message-ID: <87muhdzgli.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: 36555@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * guix/scripts/system.scm (switch-to-system) (upgrade-shepherd-services, install-bootloader): Delete variable. * guix/scripts/system.scm (%switch-to-system) (%upgrade-shepherd-services, %install-bootloader): New variable. =2D-- guix/scripts/system.scm | 151 +++++++++------------------- guix/scripts/system/reconfigure.scm | 116 +++++++-------------- 2 files changed, 79 insertions(+), 188 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 21858ee7d..b59818577 100644 =2D-- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -41,6 +41,7 @@ delete-matching-generations) #:use-module (guix graph) #:use-module (guix scripts graph) + #:use-module (guix scripts system reconfigure) #:use-module (guix build utils) #:use-module (guix progress) #:use-module ((guix build syscalls) #:select (terminal-columns)) @@ -179,38 +180,14 @@ TARGET, and register them." =20 (return *unspecified*))) =20 =2D(define* (install-bootloader installer =2D #:key =2D bootcfg bootcfg-file =2D target) +(define (install-bootloader installer bootcfg bootcfg-file target) "Run INSTALLER, a bootloader installation script, with error handling, in %STORE-MONAD." =2D (mlet %store-monad ((installer-drv (if installer =2D (lower-object installer) =2D (return #f))) =2D (bootcfg (lower-object bootcfg))) =2D (let* ((gc-root (string-append target %gc-roots-directory =2D "/bootcfg")) =2D (temp-gc-root (string-append gc-root ".new")) =2D (install (and installer-drv =2D (derivation->output-path installer-drv))) =2D (bootcfg (derivation->output-path bootcfg))) =2D ;; Prepare the symlink to bootloader config file to make sure that= it's =2D ;; a GC root when 'installer-drv' completes (being a bit paranoid.) =2D (switch-symlinks temp-gc-root bootcfg) =2D =2D (unless (false-if-exception =2D (begin =2D (install-boot-config bootcfg bootcfg-file target) =2D (when install =2D (save-load-path-excursion (primitive-load install))))) =2D (delete-file temp-gc-root) =2D (leave (G_ "failed to install bootloader ~a~%") install)) =2D =2D ;; Register bootloader config file as a GC root so that its depend= encies =2D ;; (background image, font, etc.) are not reclaimed. =2D (rename-file temp-gc-root gc-root) =2D (return #t)))) + (mlet* %store-monad ((file (lower-object + (install-bootloader-program installer bootcfg + bootcfg-file tar= get))) + (_ (built-derivations (list file)))) + (return (primitive-load (derivation->output-path file))))) =20 (define* (install os-drv target #:key (log-port (current-output-port)) @@ -266,10 +243,8 @@ the ownership of '~a' may be incorrect!~%") (populate os-dir target) =20 (mwhen install-bootloader? =2D (install-bootloader bootloader-installer =2D #:bootcfg bootcfg =2D #:bootcfg-file bootcfg-file =2D #:target target)))))) + (install-bootloader bootloader-installer bootcfg + bootcfg-file target)))))) =20 ;;; @@ -343,74 +318,39 @@ services specified in OS and not currently running. This is currently very conservative in that it does not stop or unload any running service. Unloading or stopping the wrong service ('udev', say) co= uld bring the system down." =2D (define new-services + (define target-services (service-value (fold-services (operating-system-services os) #:target-type shepherd-root-service-type))) =20 =2D ;; Arrange to simply emit a warning if the service upgrade fails. =2D (with-shepherd-error-handling =2D (call-with-service-upgrade-info new-services =2D (lambda (to-restart to-unload) =2D (for-each (lambda (unload) =2D (info (G_ "unloading service '~a'...~%") unload) =2D (unload-service unload)) =2D to-unload) =2D =2D (with-monad %store-monad =2D (munless (null? new-services) =2D (let ((new-service-names (map shepherd-service-canonical-na= me new-services)) =2D (to-restart-names (map shepherd-service-canonical-na= me to-restart)) =2D (to-start (filter shepherd-service-auto-star= t? new-services))) =2D (info (G_ "loading new services:~{ ~a~}...~%") new-service= -names) =2D (unless (null? to-restart-names) =2D ;; Listing TO-RESTART-NAMES in the message below wouldn'= t help =2D ;; because many essential services cannot be meaningfully =2D ;; restarted. See . =2D (format #t (G_ "To complete the upgrade, run 'herd resta= rt SERVICE' to stop, =2Dupgrade, and restart each service that was not automatically restarted.\= n"))) =2D (mlet %store-monad ((files (mapm %store-monad =2D (compose lower-object =2D shepherd-service= -file) =2D new-services))) =2D ;; Here we assume that FILES are exactly those that were= computed =2D ;; as part of the derivation that built OS, which is nor= mally the =2D ;; case. =2D (load-services/safe (map derivation->output-path files)) =2D =2D (for-each start-service =2D (map shepherd-service-canonical-name to-start)) =2D (return #t))))))))) =2D =2D(define* (switch-to-system os =2D #:optional (profile %system-profile)) =2D "Make a new generation of PROFILE pointing to the directory of OS, swi= tch to =2Dit atomically, and then run OS's activation script." =2D (mlet* %store-monad ((drv (operating-system-derivation os)) =2D (script (lower-object (operating-system-activatio= n-script os)))) =2D (let* ((system (derivation->output-path drv)) =2D (number (+ 1 (generation-number profile))) =2D (generation (generation-file-name profile number))) =2D (switch-symlinks generation system) =2D (switch-symlinks profile generation) =2D =2D (format #t (G_ "activating system...~%")) =2D =2D ;; The activation script may change $PATH, among others, so protect =2D ;; against that. =2D (save-environment-excursion =2D ;; Tell 'activate-current-system' what the new system is. =2D (setenv "GUIX_NEW_SYSTEM" system) =2D =2D ;; The activation script may modify '%load-path' & co., so protect =2D ;; against that. This is necessary to ensure that =2D ;; 'upgrade-shepherd-services' gets to see the right modules when= it =2D ;; computes derivations with 'gexp->derivation'. =2D (save-load-path-excursion =2D (primitive-load (derivation->output-path script)))) =2D =2D ;; Finally, try to update system services. =2D (upgrade-shepherd-services os)))) + (let-values (((to-unload to-restart) + (shepherd-service-upgrade (current-services) target-servic= es))) + (let* ((to-unload (map live-service-canonical-name to-unload)) + (to-restart (map shepherd-service-canonical-name to-restart)) + (to-start (lset-difference + eqv? + (map shepherd-service-canonical-name target-services) + (map live-service-canonical-name (current-services))= )) + (service-files + (map shepherd-service-file + (filter (lambda (service) + (memq (shepherd-service-canonical-name service) + to-start)) + target-services)))) + (mlet* %store-monad ((file (lower-object + (upgrade-services-program service-files + to-start + to-unload + to-restart))) + (_ (built-derivations (list file)))) + (return (primitive-load (derivation->output-path file))))))) + +(define (switch-to-system os) + "Make a new generation of PROFILE pointing to the directory of OS, switch +to it atomically, and then run OS's activation script." + (mlet* %store-monad ((file (lower-object (switch-system-program os))) + (_ (built-derivations (list file)))) + (return (primitive-load (derivation->output-path file))))) =20 (define-syntax-rule (unless-file-not-found exp) (catch 'system-error @@ -514,10 +454,7 @@ STORE is an open connection to the store." (built-derivations drvs) ;; Only install bootloader configuration file. Thus, no installe= r is ;; provided here. =2D (install-bootloader #f =2D #:bootcfg bootcfg =2D #:bootcfg-file bootcfg-file =2D #:target target)))))) + (install-bootloader #f bootcfg bootcfg-file target)))))) =20 ;;; @@ -918,13 +855,15 @@ static checks." =20 (case action ((reconfigure) + (newline) + (format #t (G_ "activating system...~%")) (mbegin %store-monad (switch-to-system os) (mwhen install-bootloader? =2D (install-bootloader bootloader-script =2D #:bootcfg bootcfg =2D #:bootcfg-file bootcfg-file =2D #:target "/")))) + (install-bootloader bootloader-script bootcfg + bootcfg-file (or target "/"))) + (with-shepherd-error-handling + (upgrade-shepherd-services os)))) ((init) (newline) (format #t (G_ "initializing operating system under '~a'...~%= ") diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reco= nfigure.scm index 9491bde34..1ef656f0c 100644 =2D-- a/guix/scripts/system/reconfigure.scm +++ b/guix/scripts/system/reconfigure.scm @@ -42,11 +42,11 @@ ;;; Code: =20 (define* (switch-system-program os #:optional profile) =2D "Return as a monadic value a derivation to build a scheme file that, u= pon =2Dbeing evaluated, will create a new generation of PROFILE pointing to the =2Ddirectory of OS, switch to it atomically, and run OS's activation script, =2Dreturning any textual output produced by the activation script as a stri= ng." =2D (gexp->script + "Return an executable store item 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." + (program-file "switch-to-system.scm" (with-extensions (list guile-gcrypt) (with-imported-modules (source-module-closure '((guix config) @@ -65,82 +65,36 @@ returning any textual output produced by the activation= script as a string." (switch-symlinks generation #$os) (switch-symlinks profile generation) (setenv "GUIX_NEW_SYSTEM" #$os) =2D (with-output-to-string =2D (lambda () =2D (primitive-load =2D #$(operating-system-activation-script os)))))))))) + (primitive-load #$(operating-system-activation-script os)))))= ))) =20 ;; XXX: Currently, this does NOT attempt to restart running services. See ;; for details. =2D(define (upgrade-services-program target-services) =2D "Return as a monadic value a derivation to build a scheme file that, u= pon =2Dbeing evaluated, will upgrade the Shepherd (PID 1) by unloading obsolete =2Dservices and loading new services. TARGET-SERVICES is a list =2Dof (shepherd-service-canonical-name, shepherd-service-file) pairs used f= or =2Ddetermining which services are obsolete, as well as which are new." =2D (gexp->script +(define (upgrade-services-program service-files to-start to-unload to-rest= art) + "Return an executable store item that, upon being evaluated, will upgrade +the Shepherd (PID 1) by unloading obsolete services and loading new +services. SERVICE-FILES is a list of Shepherd service files to load, and +TO-START, TO-UNLOAD, and TO-RESTART are lists of the Shepherd services' +canonical names (symbols)." + (program-file "upgrade-shepherd-services.scm" (with-imported-modules '((gnu services herd)) #~(begin (use-modules (gnu services herd) (srfi srfi-1)) =20 =2D (define (call-with-shepherd-error-handling proc) =2D (lambda (service) =2D (catch 'system-error =2D (lambda () =2D (proc service) =2D #f) =2D (lambda (key proc format-string format-args errno . rest) =2D (apply format #f format-string format-args))))) =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 unloaded =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 servic= e)) =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 service= )) =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 ;; Load the service files for any new services. =2D (load-services/safe (map second to-start)) + (load-services/safe '#$service-files) =20 ;; Unload obsolete services and start new services. =2D (filter string? =2D (append (map (call-with-shepherd-error-handling unload-s= ervice) =2D to-unload) =2D (map (call-with-shepherd-error-handling start-se= rvice) =2D (map first to-start)))))))) + (for-each unload-service '#$to-unload) + (for-each start-service '#$to-start))))) =20 (define (install-bootloader-program installer-script bootcfg bootcfg-file = target) =2D "Return as a monadic value a derivation to build a scheme file that, u= pon =2Dbeing evaluated, will install BOOTCFG to BOOTCFG-FILE, a target file nam= e, on =2DTARGET, a mount point, and subsequently run INSTALLER-SCRIPT, returning = any =2Dtextual output produced by the installer script as a string." =2D (gexp->script + "Return an executable store item 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." + (program-file "install-bootloader.scm" (with-extensions (list guile-gcrypt) (with-imported-modules (source-module-closure '((gnu build install) @@ -152,19 +106,17 @@ textual output produced by the installer script as a = string." (guix utils)) (let* ((gc-root (string-append #$target %gc-roots-directory "/b= ootcfg")) (temp-gc-root (string-append gc-root ".new"))) =2D (switch-symlinks temp-gc-root gc-root) =2D =2D (let ((installer-result =2D (false-if-exception =2D (begin =2D (install-boot-config #$bootcfg #$bootcfg-file #$t= arget) =2D (with-output-to-string =2D (lambda () =2D (when #$installer-script =2D (primitive-load #$installer-script)))))))) =2D (unless installer-result =2D (delete-file temp-gc-root) =2D (error "failed to install bootloader")) =2D (rename-file temp-gc-root gc-root) =2D installer-result))))))) + (install-boot-config #$bootcfg #$bootcfg-file #$target) + ;; Preserve the previous activation's garbage collector root + ;; until the bootloader installer has run, so that a failure = in + ;; the bootloader's installer script doesn't leave the user w= ith + ;; a broken installation. + (when #$installer-script + (catch #t + (lambda () + (primitive-load #$installer-script)) + (lambda args + (delete-file temp-gc-root) + (apply throw args)))) + (rename-file temp-gc-root gc-root))))))) =2D-=20 2.22.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEa1VJLOiXAjQ2BGSm9Qb9Fp2P2VoFAl0uYjkACgkQ9Qb9Fp2P 2VrF3A//QZIg17J8CNX0Q5rukZq9Y1X1tEV7z0BIFSOFUQQJN21gtYt+al+i4XaD 0ANzUy+fOW6/6/crQqRmBgyQkByENBm74SgZeT7tD6d56dI70pb40DWkvCDil7Uf wIlWRL1FLyuw5PeBBKC4yA87x/AqywNYJM8uPxu2ncXmTBBvZU5989fUa40y2Am/ g0pRJkhG3M9h3xsAM2cbmTxDbWBU0P93bZX+H2tCoRdLAzPM8VdM3jdVo623UNhQ hzBu9/rNdM+/Ty4ygYlhnP+1SjbbNMQsQDVBECPfRPcxJXWJV12fS3UxVbsOQxyV lTNhDWjona4EpLED2y9y0EAO3/llmoKIH/Hs0bdnKBACAy/qfyo91pvCZbt/N9IR 6mHzHujC/hWdogNZSaD/3GkTHhpM+Rp4X4VFBpJJ9tX/ZZOLwxyrAcVcw1j/zgFw 5u+HmL3QCZ56L6ZrtDTucfaq8nlQrfBFU1CMBHrQ8pOWtuaNJ62zDP6g3nmcL6zk r1Gxcrrh/nJReKvuRgx13i7R4C9lEQeWyQabhEtqK9lxxNMA5t4VBB7vUJj11FHF F9QhwspdgXVeRzKAMehakUM2X4Jsrl9x8lETve6UdSUt2vupOknVuI6P+WWonxgl GUame1vP1AYmZKJrGSBWevGJkX0+MmrNfKCvfsgJZDb/Z5buAHQ= =Vm52 -----END PGP SIGNATURE----- --=-=-=--