ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename boot-parameters to boot-alternatives when appropriate.

Browse source 
Throughout the code base, the token 'boot-parameters' refers to collection of
data that is stored on disk for each system generation. It was confusing to
use it for a list of such records. This comment imposes an alternative name.

* gnu/machine/ssh.scm (machine-boot-parameters): Rename to
  machine->boot-alternatives.
  (machine->boot-alternatives, roll-back-managed-host): Use
  boot-alternatives instead of boot-parameters as appropriate.
* guix/scripts/system.scm (profile-boot-parameters): Rename to
  profile->boot-alternatives.
  (reinstall-bootloader, perform-action): Use boot-alternatives instead
  of boot-parameters as appropriate.

Change-Id: Iabb04dbb39f42f989692bede7304f20a69bef9fb
This commit is contained in:
Felix Lechner 2024-09-21 12:23:19 +02:00 committed by Ryan Schanzenbacher
parent 5ec2223c71
commit 02b0324822
Signed by: ryan77627
GPG key ID: 81B0E222A3E2308E
2 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/machine/ssh.scm
View file

@ -417,7 +417,7 @@ (define not-config?
(('gnu _ ...) #t) (('gnu _ ...) #t)
(_ #f))) (_ #f)))
(define (machine-boot-parameters machine) (define (machine->boot-alternatives machine)
"Monadic procedure returning a list of 'boot-parameters' for the generations "Monadic procedure returning a list of 'boot-parameters' for the generations
of MACHINE's system profile, ordered from most recent to oldest." of MACHINE's system profile, ordered from most recent to oldest."
(define remote-exp (define remote-exp
@ -503,14 +503,14 @@ (define system (machine-ssh-configuration-system config))
(machine-become-command machine))) (machine-become-command machine)))
(mlet %store-monad ((_ (check-deployment-sanity machine)) (mlet %store-monad ((_ (check-deployment-sanity machine))
(boot-parameters (machine-boot-parameters machine))) (boot-alternatives (machine->boot-alternatives machine)))
;; Make sure code that check %CURRENT-SYSTEM, such as ;; Make sure code that check %CURRENT-SYSTEM, such as
;; %BASE-INITRD-MODULES, gets to see the right value. ;; %BASE-INITRD-MODULES, gets to see the right value.
(parameterize ((%current-system system) (parameterize ((%current-system system)
(%current-target-system #f)) (%current-target-system #f))
(let* ((os (machine-operating-system machine)) (let* ((os (machine-operating-system machine))
(eval (cut machine-remote-eval machine <>)) (eval (cut machine-remote-eval machine <>))
(menu-entries (map boot-parameters->menu-entry boot-parameters)) (menu-entries (map boot-parameters->menu-entry boot-alternatives))
(bootloader-configuration (operating-system-bootloader os)) (bootloader-configuration (operating-system-bootloader os))
(bootcfg (operating-system-bootcfg os menu-entries))) (bootcfg (operating-system-bootcfg os menu-entries)))
(define-syntax-rule (eval/error-handling condition handler ...) (define-syntax-rule (eval/error-handling condition handler ...)
@ -581,19 +581,19 @@ (define target-generation
(define roll-back-failure (define roll-back-failure
(condition (&message (message (G_ "could not roll-back machine"))))) (condition (&message (message (G_ "could not roll-back machine")))))
(mlet* %store-monad ((boot-parameters (machine-boot-parameters machine)) (mlet* %store-monad ((boot-alternatives (machine->boot-alternatives machine))
(_ -> (if (< (length boot-parameters) 2) (_ -> (if (< (length boot-alternatives) 2)
(raise roll-back-failure))) (raise roll-back-failure)))
(entries -> (map boot-parameters->menu-entry (entries -> (map boot-parameters->menu-entry
(list (second boot-parameters)))) (list (second boot-alternatives))))
(locale -> (boot-parameters-locale (locale -> (boot-parameters-locale
(second boot-parameters))) (second boot-alternatives)))
(crypto-dev -> (boot-parameters-store-crypto-devices (crypto-dev -> (boot-parameters-store-crypto-devices
(second boot-parameters))) (second boot-alternatives)))
(store-dir -> (boot-parameters-store-directory-prefix (store-dir -> (boot-parameters-store-directory-prefix
(second boot-parameters))) (second boot-alternatives)))
(old-entries -> (map boot-parameters->menu-entry (old-entries -> (map boot-parameters->menu-entry
(drop boot-parameters 2))) (drop boot-alternatives 2)))
(bootloader -> (operating-system-bootloader (bootloader -> (operating-system-bootloader
(machine-operating-system machine))) (machine-operating-system machine)))
(bootcfg (lower-object (bootcfg (lower-object

19
guix/scripts/system.scm
View file

@ -328,9 +328,9 @@ (define-syntax-rule (unless-file-not-found exp)
#f #f
(apply throw args))))) (apply throw args)))))
(define* (profile-boot-parameters #:optional (profile %system-profile) (define* (profile->boot-alternatives #:optional (profile %system-profile)
(numbers (numbers
(reverse (generation-numbers profile)))) (reverse (generation-numbers profile))))
"Return a list of 'boot-parameters' for the generations of PROFILE specified "Return a list of 'boot-parameters' for the generations of PROFILE specified
by NUMBERS, which is a list of generation numbers. The list is ordered from by NUMBERS, which is a list of generation numbers. The list is ordered from
the most recent to the oldest profiles." the most recent to the oldest profiles."
@ -395,18 +395,19 @@ (define (reinstall-bootloader store number)
(bootloader bootloader))) (bootloader bootloader)))
;; Make the specified system generation the default entry. ;; Make the specified system generation the default entry.
(params (first (profile-boot-parameters %system-profile (params (first (profile->boot-alternatives %system-profile
(list number)))) (list number))))
(locale (boot-parameters-locale params)) (locale (boot-parameters-locale params))
(store-crypto-devices (boot-parameters-store-crypto-devices params)) (store-crypto-devices (boot-parameters-store-crypto-devices params))
(store-directory-prefix (store-directory-prefix
(boot-parameters-store-directory-prefix params)) (boot-parameters-store-directory-prefix params))
(old-generations (old-generations
(delv number (reverse (generation-numbers %system-profile)))) (delv number (reverse (generation-numbers %system-profile))))
(old-params (profile-boot-parameters (previous-boot-alternatives (profile->boot-alternatives
%system-profile old-generations)) %system-profile old-generations))
(entries (list (boot-parameters->menu-entry params))) (entries (list (boot-parameters->menu-entry params)))
(old-entries (map boot-parameters->menu-entry old-params))) (old-entries (map boot-parameters->menu-entry
previous-boot-alternatives)))
(run-with-store store (run-with-store store
(mlet* %store-monad (mlet* %store-monad
((bootcfg (lower-object ((bootcfg (lower-object
@ -823,7 +824,7 @@ (define bootcfg
os os
(if (eq? action 'init) (if (eq? action 'init)
'() '()
(map boot-parameters->menu-entry (profile-boot-parameters)))))) (map boot-parameters->menu-entry (profile->boot-alternatives))))))
(when (eq? action 'reconfigure) (when (eq? action 'reconfigure)
(maybe-suggest-running-guix-pull) (maybe-suggest-running-guix-pull)