[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69343] [PATCH v2 09/12] Give a separate name to a commonly used exp
From: |
Lilah Tascheter |
Subject: |
[bug#69343] [PATCH v2 09/12] Give a separate name to a commonly used expression. |
Date: |
Fri, 8 Mar 2024 02:12:05 -0600 |
From: Felix Lechner <felix.lechner@lease-up.com>
* gnu/machine/ssh.scm (roll-back-managed-host): Factor out a
subexpression into new variable parameters.
Change-Id: I8d70684142bea736042d6c9dc8276ea7bdb9c181
---
gnu/machine/ssh.scm | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
index 9adb5e79b9..45ab8b9868 100644
--- a/gnu/machine/ssh.scm
+++ b/gnu/machine/ssh.scm
@@ -584,14 +584,11 @@ (define (roll-back-managed-host machine)
(mlet* %store-monad ((boot-alternatives (machine->boot-alternatives machine))
(_ -> (if (< (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
--
2.41.0
- [bug#69343] [PATCH v2 00/12] Simplify bootloader data structures and procedures, Lilah Tascheter, 2024/03/08
- [bug#69343] [PATCH v2 01/12] Fix bug where the extra menu entries for a bootloader were shown twice., Lilah Tascheter, 2024/03/08
- [bug#69343] [PATCH v2 09/12] Give a separate name to a commonly used expression.,
Lilah Tascheter <=
- [bug#69343] [PATCH v2 06/12] Offer a uniform decorated-boot-label and use it., Lilah Tascheter, 2024/03/08
- [bug#69343] [PATCH v2 05/12] Move epoch->date-string to gnu/system/boot.scm and use it elsewhere., Lilah Tascheter, 2024/03/08
- [bug#69343] [PATCH v2 03/12] Also move boot-parameters->menu-entry., Lilah Tascheter, 2024/03/08
- [bug#69343] [PATCH v2 08/12] Rename two remote variables confusingly named 'generations'., Lilah Tascheter, 2024/03/08
- [bug#69343] [PATCH v2 02/12] Move <boot-parameters> record to a separate file., Lilah Tascheter, 2024/03/08
- [bug#69343] [PATCH v2 10/12] Simplify profile->boot-alternatives., Lilah Tascheter, 2024/03/08
- [bug#69343] [PATCH v2 04/12] Rename seconds->string procedure to epoch->date-string., Lilah Tascheter, 2024/03/08
- [bug#69343] [PATCH v2 12/12] Encapsulate <boot-parameters> to retain generation, system-path and epoch., Lilah Tascheter, 2024/03/08
- [bug#69343] [PATCH v2 11/12] Split generation->boot-parameters out of profile->boot-alternatives., Lilah Tascheter, 2024/03/08
- [bug#69343] [PATCH v2 07/12] Rename boot-parameters to boot-alternatives when appropriate., Lilah Tascheter, 2024/03/08