[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/11: guix system: Simplify bootloader package handling.
From: |
Ludovic Courtès |
Subject: |
09/11: guix system: Simplify bootloader package handling. |
Date: |
Sun, 18 Nov 2018 17:40:58 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 6e47628d4c9173633d0ac2a0ddaeb50a8257d725
Author: Ludovic Courtès <address@hidden>
Date: Fri Nov 16 09:15:15 2018 +0100
guix system: Simplify bootloader package handling.
* guix/scripts/system.scm (perform-action): Remove 'bootloader-package'
variable. Pass (bootloader-package bootloader) as the 2nd argument to
'bootloader-installer-derivation'. Remove BOOTLOADER-PACKAGE from DRVS
since it's redundant.
---
guix/scripts/system.scm | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index c0f16cb..1448810 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -851,11 +851,6 @@ static checks."
#:mappings mappings))
(bootloader -> (bootloader-configuration-bootloader
(operating-system-bootloader os)))
- (bootloader-package
- (let ((package (bootloader-package bootloader)))
- (if package
- (package->derivation package)
- (return #f))))
(bootcfg (if (eq? 'container action)
(return #f)
(lower-object
@@ -870,17 +865,15 @@ static checks."
(let ((installer (bootloader-installer bootloader))
(target (or target "/")))
(bootloader-installer-derivation installer
- bootloader-package
+ (bootloader-package bootloader)
bootloader-target target)))
;; For 'init' and 'reconfigure', always build BOOTCFG, even if
;; --no-bootloader is passed, because we then use it as a GC root.
;; See <http://bugs.gnu.org/21068>.
(drvs -> (if (memq action '(init reconfigure))
- (if (and install-bootloader? bootloader-package)
- (list sys bootcfg
- bootloader-package
- bootloader-installer)
+ (if install-bootloader?
+ (list sys bootcfg bootloader-installer)
(list sys bootcfg))
(list sys)))
(% (if derivations-only?
- 01/11: activation: Aways pass '-d HOME' to 'useradd'., (continued)
- 01/11: activation: Aways pass '-d HOME' to 'useradd'., Ludovic Courtès, 2018/11/18
- 02/11: bootloader: De-monadify configuration file generators., Ludovic Courtès, 2018/11/18
- 04/11: linux-initrd: Return file-like objects instead of monadic values., Ludovic Courtès, 2018/11/18
- 10/11: guix system: De-monadify bootloader installation script., Ludovic Courtès, 2018/11/18
- 05/11: system: De-monadify 'operating-system-boot-parameters'., Ludovic Courtès, 2018/11/18
- 08/11: vm: Remove explicit calls to 'operating-system-derivation'., Ludovic Courtès, 2018/11/18
- 03/11: system: Simplify kernel argument handling., Ludovic Courtès, 2018/11/18
- 07/11: system: De-monadify 'operating-system-bootcfg'., Ludovic Courtès, 2018/11/18
- 06/11: system: Please Emacs., Ludovic Courtès, 2018/11/18
- 11/11: guix system: Clarify 'perform-action'., Ludovic Courtès, 2018/11/18
- 09/11: guix system: Simplify bootloader package handling.,
Ludovic Courtès <=