aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-11-16 09:15:15 +0100
committerLudovic Courtès <ludo@gnu.org>2018-11-18 23:37:45 +0100
commit6e47628d4c9173633d0ac2a0ddaeb50a8257d725 (patch)
tree36c1a18a820e12b087e7a7789f823a0bb6a79e94
parent8bff7dc2adeaac7ed1b7f46efc0623e6476fb5c0 (diff)
downloadguix-6e47628d4c9173633d0ac2a0ddaeb50a8257d725.tar
guix-6e47628d4c9173633d0ac2a0ddaeb50a8257d725.tar.gz
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.
-rw-r--r--guix/scripts/system.scm13
1 files changed, 3 insertions, 10 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index c0f16cb2a7..14488107b8 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?