mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
Give a separate name to a commonly used expression.
* gnu/machine/ssh.scm (roll-back-managed-host): Factor out a subexpression into new variable parameters. Change-Id: I8d70684142bea736042d6c9dc8276ea7bdb9c181
This commit is contained in:
parent
b13726dd98
commit
8356f8c2ba
1 changed files with 23 additions and 25 deletions
|
@ -582,17 +582,15 @@ (define target-generation
|
|||
(define roll-back-failure
|
||||
(condition (&message (message (G_ "could not roll-back machine")))))
|
||||
|
||||
(mlet* %store-monad ((boot-alternatives (machine->boot-alternatives machine))
|
||||
(_ -> (if (< (length boot-alternatives) 2)
|
||||
(mlet* %store-monad
|
||||
((boot-alternatives (machine->boot-alternatives machine))
|
||||
(_ -> (when (< (length boot-alternatives) 2)
|
||||
(raise roll-back-failure)))
|
||||
(entries -> (map boot-parameters->menu-entry
|
||||
(list (second boot-alternatives))))
|
||||
(locale -> (boot-parameters-locale
|
||||
(second boot-alternatives)))
|
||||
(crypto-dev -> (boot-parameters-store-crypto-devices
|
||||
(second boot-alternatives)))
|
||||
(store-dir -> (boot-parameters-store-directory-prefix
|
||||
(second boot-alternatives)))
|
||||
(parameters (second boot-alternatives))
|
||||
(entries -> (list (boot-parameters->menu-entry parameters)))
|
||||
(locale -> (boot-parameters-locale parameters))
|
||||
(crypto-dev -> (boot-parameters-store-crypto-devices parameters))
|
||||
(store-dir -> (boot-parameters-store-directory-prefix parameters))
|
||||
(old-entries -> (map boot-parameters->menu-entry
|
||||
(drop boot-alternatives 2)))
|
||||
(bootloader -> (operating-system-bootloader
|
||||
|
|
Loading…
Reference in a new issue